summaryrefslogtreecommitdiff
path: root/package/dnsmasq/files/dnsmasq.init
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-28 20:56:44 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-28 20:56:44 +0100
commit2c8917958da115704507aab835c41c1a4a63664d (patch)
treee79c26b6347e2ae8444bcdbce1236cc48f63107e /package/dnsmasq/files/dnsmasq.init
parentcf5ef7c683fa845a6e6412b319e0a1040aa0f445 (diff)
parentcd83ced050a5d68c922a0de054ac022cd4ff26ac (diff)
resolve conflict
Diffstat (limited to 'package/dnsmasq/files/dnsmasq.init')
-rw-r--r--package/dnsmasq/files/dnsmasq.init2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 7f4f75325..07c76f862 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -6,7 +6,7 @@
case $1 in
autostop) ;;
autostart)
- [[ $dns_dhcp = NO ]] && exit 0
+ [[ $dnsmasq = NO ]] && exit 0
exec sh $0 start
;;
start)