Accepting request 891592 from home:13ilya:branches:network
- Refreshed spec-file via spec-cleaner and manual optimisations. * Changed files: pppoe-connect, pppoe-setup, pppoe-status and pppoe-stop (replaced /var/run by /run). - Updated to 3.15 * Don't ignore SIGTERM and SIGINT. Send PADT and exit if one of those signals is received. * Switch from net-tools to iproute2. OBS-URL: https://build.opensuse.org/request/show/891592 OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=30
This commit is contained in:
committed by
Git OBS Bridge
parent
5da48bef51
commit
8b1334bf3e
@@ -116,14 +116,14 @@ if [ -r "$PIDFILE" ] ; then
|
||||
fi
|
||||
|
||||
# Kill br2684ctl if necessary
|
||||
if [ -n "$BR2684DEV" -a -r /var/run/nas$BR2684DEV.pid ]; then
|
||||
PIDS=`cat /var/run/nas$BR2684DEV.pid`
|
||||
if [ -n "$BR2684DEV" -a -r /run/nas$BR2684DEV.pid ]; then
|
||||
PIDS=`cat /run/nas$BR2684DEV.pid`
|
||||
kill -0 $PIDS > /dev/null 2>&1
|
||||
if [ $? = 0 ]; then
|
||||
$LOGGER -p daemon.notice "Killing br2684ctl for nas$BR2684DEV"
|
||||
kill $PIDS > /dev/null 2>&1
|
||||
fi
|
||||
rm -f /var/run/nas$BR2684DEV.pid
|
||||
rm -f /run/nas$BR2684DEV.pid
|
||||
fi
|
||||
|
||||
rm -f "$PIDFILE" "$PPPD_PIDFILE" "$PPPOE_PIDFILE" "$STARTPID"
|
||||
|
Reference in New Issue
Block a user