From f2463372c9e35cf640f1b0ccede0314a239b0d25 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 1 Mar 2011 21:19:11 +0100 Subject: fix startup scripts, when variable is not set in /etc/rc.conf --- package/dhcp/files/dhcp-server.postinst | 1 + package/dhcp/files/dhcpd.init | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'package/dhcp') diff --git a/package/dhcp/files/dhcp-server.postinst b/package/dhcp/files/dhcp-server.postinst index 592120cdc..d27f5aa8d 100644 --- a/package/dhcp/files/dhcp-server.postinst +++ b/package/dhcp/files/dhcp-server.postinst @@ -1,3 +1,4 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh add_rcconf 'e.g. "eth0.1 eth1"' dhcpd_flags +add_rcconf dhcpd dhcpd NO diff --git a/package/dhcp/files/dhcpd.init b/package/dhcp/files/dhcpd.init index 02349acae..96b9e82c4 100644 --- a/package/dhcp/files/dhcpd.init +++ b/package/dhcp/files/dhcpd.init @@ -5,7 +5,7 @@ case $1 in autostart) - [[ $dhcpd_flags = NO ]] && exit 0 + test x"${dhcpd:-NO}" = x"NO" && exit 0 exec sh $0 start ;; start) -- cgit v1.2.3