diff options
| author | Alexandr D. Kanevskiy <kad@blackcatlinux.com> | 2004-04-12 05:41:01 +0000 |
|---|---|---|
| committer | Alexandr D. Kanevskiy <kad@blackcatlinux.com> | 2004-04-12 05:41:01 +0000 |
| commit | 2dae8c323976d0655400d8d1726ff575b8f74338 (patch) | |
| tree | 7b4311fe17d544e5a238d30b03c8064bbb335c3a /scripts | |
| parent | d6c6b00710137c92ddf0a9e7c8838106f165b138 (diff) | |
| download | ppp-2dae8c323976d0655400d8d1726ff575b8f74338.tar.gz | |
tidy up shell scripting, common radvd path in examples
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ipv6-down.sample | 20 | ||||
| -rw-r--r-- | scripts/ipv6-up.sample | 23 | ||||
| -rw-r--r-- | scripts/pon | 8 |
3 files changed, 27 insertions, 24 deletions
diff --git a/scripts/ipv6-down.sample b/scripts/ipv6-down.sample index 742bbe5..bf31574 100644 --- a/scripts/ipv6-down.sample +++ b/scripts/ipv6-down.sample @@ -8,24 +8,24 @@ # Kill the router advertisement daemon on this interface. # The killing procedure is copied from RedHat 6.0 initscripts. -DEVICE=$1 +DEVICE="$1" -PIDFILE=/var/run/radvd-$DEVICE.pid +PIDFILE="/var/run/radvd-$DEVICE.pid" -[ -f $PIDFILE ] || exit 0 +[ -f "$PIDFILE" ] || exit 0 -PID=`cat $PIDFILE` +PID="$(cat "$PIDFILE")" if [ "$PID" != "" ]; then - if ps h $PID >/dev/null 2>&1; then - kill -TERM $PID + if ps h "$PID" >/dev/null 2>&1; then + kill -TERM "$PID" usleep 10000 - if ps h $PID >/dev/null 2>&1; then + if ps h "$PID" >/dev/null 2>&1; then sleep 1 - if ps h $PID >/dev/null 2>&1; then - kill -KILL $PID + if ps h "$PID" >/dev/null 2>&1; then + kill -KILL "$PID" fi fi fi fi -rm -f $PIDFILE +rm -f "$PIDFILE" diff --git a/scripts/ipv6-up.sample b/scripts/ipv6-up.sample index e880445..0974da9 100644 --- a/scripts/ipv6-up.sample +++ b/scripts/ipv6-up.sample @@ -8,26 +8,27 @@ # Start router advertisements on this link. # Based on radvd 0.5.0 behaviour -DEVICE=$1 +DEVICE="$1" -CFGFILE=/usr/inet6/etc/radvd.conf-$DEVICE -PIDFILE=/var/run/radvd-$DEVICE.pid +CFGFILE="/etc/radvd.conf-$DEVICE" +PIDFILE="/var/run/radvd-$DEVICE.pid" +EXEFILE="/usr/sbin/radvd" -if [ -x /usr/inet6/sbin/radvd && -f $CFGFILE ]; then - touch $PIDFILE - if [ ! -f $PIDFILE ]; then +if [ -x "$EXEFILE" -a -f "$CFGFILE" ]; then + touch "$PIDFILE" + if [ ! -f "$PIDFILE" ]; then echo "error: $PIDFILE is not a regular file. Aborting" exit 0 fi - PID=`cat $PIDFILE` - if [ "$PID" != "" ]; then - ps h $PID >/dev/null 2>&1 && exit 0 + PID="$(cat "$PIDFILE")" + if [ -n "$PID" ]; then + ps h "$PID" >/dev/null 2>&1 && exit 0 fi # radvd 0.5.0 doesn't write a pid-file so we do it here # enabling debugging keeps radvd in foreground, putting it # on background gives us the PID. - /usr/inet6/sbin/radvd -d 1 -C $CFGFILE & - echo $! >$PIDFILE + "$EXEFILE" -d 1 -C "$CFGFILE" & + echo $! >"$PIDFILE" fi diff --git a/scripts/pon b/scripts/pon index 6117fa8..ef47518 100644 --- a/scripts/pon +++ b/scripts/pon @@ -1,10 +1,12 @@ #!/bin/sh +PPP_ON_BOOT=/etc/ppp/ppp_on_boot + case "$1" in -*) echo " Usage: pon [provider] [arguments] -If pon is invoked without arguments, /etc/ppp/ppp_on_boot file will be +If pon is invoked without arguments, $PPP_ON_BOOT file will be run, presuming it exists and is executable. Otherwise, a PPP connection will be started using settings from /etc/ppp/peers/provider. If you specify one argument, a PPP connection will be started using @@ -16,8 +18,8 @@ pppd. ;; esac -if [ -z "$1" -a -x /etc/ppp/ppp_on_boot ]; then - exec /etc/ppp/ppp_on_boot +if [ -z "$1" -a -x "$PPP_ON_BOOT" ]; then + exec "$PPP_ON_BOOT" fi if [ -z "$1" -a ! -f /etc/ppp/peers/provider ]; then |