diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-03-24 07:10:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-24 07:10:47 +0100 |
| commit | acb9815216dfe48c9d8684056381d9cd7b10fee0 (patch) | |
| tree | 9c011c37f08d2ed747b10ef90198103e07dd38da /src/etc | |
| parent | 92e6efeec0e46570daacd5d96e754a3c89868e0b (diff) | |
| parent | 8f39784c847801c0b766a0c9289da0976ffd0604 (diff) | |
| download | vyos-1x-acb9815216dfe48c9d8684056381d9cd7b10fee0.tar.gz vyos-1x-acb9815216dfe48c9d8684056381d9cd7b10fee0.zip | |
Merge pull request #261 from thomas-mangin/2154
ethernet: T2154: do not report errors where none are
Diffstat (limited to 'src/etc')
| -rwxr-xr-x | src/etc/init.d/isc-dhcpv4-server | 4 | ||||
| -rwxr-xr-x | src/etc/init.d/isc-dhcpv6-relay | 4 | ||||
| -rwxr-xr-x | src/etc/init.d/isc-dhcpv6-server | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/etc/init.d/isc-dhcpv4-server b/src/etc/init.d/isc-dhcpv4-server index 377634a13..94a1020ac 100755 --- a/src/etc/init.d/isc-dhcpv4-server +++ b/src/etc/init.d/isc-dhcpv4-server @@ -72,7 +72,7 @@ case "$1" in start) test_config log_daemon_msg "Starting $DESC" "$NAME" - start-stop-daemon --start --quiet --pidfile "$DHCPD_PID" \ + start-stop-daemon --start --oknodo --quiet --pidfile "$DHCPD_PID" \ --exec /usr/sbin/dhcpd -- \ -q $OPTIONS -cf "$DHCPD_CONF" -pf "$DHCPD_PID" $INTERFACES sleep 2 @@ -87,7 +87,7 @@ case "$1" in ;; stop) log_daemon_msg "Stopping $DESC" "$NAME" - start-stop-daemon --stop --quiet --pidfile "$DHCPD_PID" + start-stop-daemon --stop --oknodo --quiet --pidfile "$DHCPD_PID" log_end_msg $? rm -f "$DHCPD_PID" ;; diff --git a/src/etc/init.d/isc-dhcpv6-relay b/src/etc/init.d/isc-dhcpv6-relay index 5a8ce620c..e553eafd1 100755 --- a/src/etc/init.d/isc-dhcpv6-relay +++ b/src/etc/init.d/isc-dhcpv6-relay @@ -31,11 +31,11 @@ DHCRELAYPID=/var/run/dhcv6relay.pid case "$1" in start) - start-stop-daemon --start --quiet --pidfile $DHCRELAYPID \ + start-stop-daemon --start --oknodo --quiet --pidfile $DHCRELAYPID \ --exec /usr/sbin/dhcrelay -- -q $OPTIONS -pf $DHCRELAYPID ;; stop) - start-stop-daemon --stop --quiet --pidfile $DHCRELAYPID + start-stop-daemon --stop --oknodo --quiet --pidfile $DHCRELAYPID ;; restart | force-reload) $0 stop diff --git a/src/etc/init.d/isc-dhcpv6-server b/src/etc/init.d/isc-dhcpv6-server index 55f59b68e..f6b27cb4a 100755 --- a/src/etc/init.d/isc-dhcpv6-server +++ b/src/etc/init.d/isc-dhcpv6-server @@ -72,7 +72,7 @@ case "$1" in start) test_config log_daemon_msg "Starting $DESC" "$NAME" - start-stop-daemon --start --quiet --pidfile "$DHCPD_PID" \ + start-stop-daemon --start --oknodo --quiet --pidfile "$DHCPD_PID" \ --exec /usr/sbin/dhcpd -- \ -q $OPTIONS -cf "$DHCPD_CONF" -pf "$DHCPD_PID" $INTERFACES sleep 2 @@ -87,7 +87,7 @@ case "$1" in ;; stop) log_daemon_msg "Stopping $DESC" "$NAME" - start-stop-daemon --stop --quiet --pidfile "$DHCPD_PID" + start-stop-daemon --stop --oknodo --quiet --pidfile "$DHCPD_PID" log_end_msg $? rm -f "$DHCPD_PID" ;; |