Commit 5f617ffa authored by André Erdmann's avatar André Erdmann Committed by Peter Korsgaard
Browse files

sysv init scripts: fix == bashism



test a == b is not available in e.g. dash.

Command(s) used for editing:

  q=\[\"\'\]
  operand="${q}?[$]?[a-zA-Z0-9_\?]+${q}?"  ## doesn't detect ${VAR}
  test_expr="(\[\s+${operand}\s+)==(\s+${operand}\s+\])"

  find . -type f -name '[SK][0-9][0-9]*' | \
     xargs sed -r -e "s@${test_expr}@\1=\2@g" -i

Signed-off-by: default avatarAndré Erdmann <dywi@mailerd.de>
Acked-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 7541ec81
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@ case "$1" in
	start)
		echo -n "Starting acpid: "
		start-stop-daemon -S -q -m -b -p /var/run/acpid.pid --exec /usr/sbin/acpid -- -n
		[ $? == 0 ] && echo "OK" || echo "FAIL"
		[ $? = 0 ] && echo "OK" || echo "FAIL"
		;;
	stop)
		echo -n "Stopping acpid: "
		start-stop-daemon -K -q -p /var/run/acpid.pid
		[ $? == 0 ] && echo "OK" || echo "FAIL"
		[ $? = 0 ] && echo "OK" || echo "FAIL"
		;;
	restart)
		"$0" stop
+2 −2
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ case "$1" in
		fi
		echo -n "Starting domain name daemon: "
		start-stop-daemon -S -x $DAEMON -- -c $CONFIG -u named
		[ $? == 0 ] && echo "OK" || echo "FAIL"
		[ $? = 0 ] && echo "OK" || echo "FAIL"
		;;
	stop)
		echo -n "Stopping domain name daemon: "
		rndc stop || start-stop-daemon -K -x $DAEMON
		[ $? == 0 ] && echo "OK" || echo "FAIL"
		[ $? = 0 ] && echo "OK" || echo "FAIL"
		;;
	restart)
		$0 stop || true
+2 −2
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ case "$1" in
	start)
		echo -n "Starting DHCP relay: "
		start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS
		[ $? == 0 ] && echo "OK" || echo "FAIL"
		[ $? = 0 ] && echo "OK" || echo "FAIL"
		;;
	stop)
		echo -n "Stopping DHCP relay: "
		start-stop-daemon -K -x /usr/sbin/dhcrelay
		[ $? == 0 ] && echo "OK" || echo "FAIL"
		[ $? = 0 ] && echo "OK" || echo "FAIL"
		;;
	restart | force-reload)
		$0 stop
+2 −2
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ case "$1" in
		test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/
		test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases
		start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES
		[ $? == 0 ] && echo "OK" || echo "FAIL"
		[ $? = 0 ] && echo "OK" || echo "FAIL"
		;;
	stop)
		echo -n "Stopping DHCP server: dhcpd3"
		start-stop-daemon -K -x /usr/sbin/dhcpd
		[ $? == 0 ] && echo "OK" || echo "FAIL"
		[ $? = 0 ] && echo "OK" || echo "FAIL"
		;;
	restart | force-reload)
		$0 stop
+2 −2
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ case "$1" in
	start)
		echo -n "Starting dnsmasq: "
		start-stop-daemon -S -x /usr/sbin/dnsmasq
		[ $? == 0 ] && echo "OK" || echo "FAIL"
		[ $? = 0 ] && echo "OK" || echo "FAIL"
		;;
	stop)
		echo -n "Stopping dnsmasq: "
		start-stop-daemon -K -q -x /usr/sbin/dnsmasq
		[ $? == 0 ] && echo "OK" || echo "FAIL"
		[ $? = 0 ] && echo "OK" || echo "FAIL"
		;;
	restart|reload)
		$0 stop
Loading