diff options
| author | Roy Marples <roy@marples.name> | 2007-11-22 13:31:19 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-11-22 13:31:19 +0000 |
| commit | 5f37abddde55ee5ec2afb4e2b565326261bbc976 (patch) | |
| tree | 77518cab6bfcb1ba0ae048f982df9a26f96d8927 | |
| parent | 09c5e5d415d5813f49d871dc0712212a92a695ed (diff) | |
Use yesno for more robustness
| -rw-r--r-- | net.Linux/clip.sh | 6 | ||||
| -rw-r--r-- | net.Linux/vlan.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net.Linux/clip.sh b/net.Linux/clip.sh index 771ec204..7c7ec7d4 100644 --- a/net.Linux/clip.sh +++ b/net.Linux/clip.sh @@ -28,7 +28,7 @@ atmclip_svcs_start() { einfo "First CLIP instance: starting ATM CLIP daemons" eindent - if [ "${clip_full:-yes}" = "yes" ]; then + if yesno ${clip_full:-yes}; then atmclip_svc_start atmsigd "Signaling" && \ atmclip_svc_start ilmid "Integrated Local Management Interface" && \ atmclip_svc_start atmarpd "Address Resolution Protocol" @@ -58,7 +58,7 @@ atmclip_svcs_stop() { sync atmclip_svc_stop atmarpd "Address Resolution Protocol" - if [ "${clip_full:-yes}" = "yes" ]; then + if yesno ${clip_full:-yes}; then atmclip_svc_stop ilmid "Integrated Local Management Interface" atmclip_svc_stop atmsigd "Signaling" fi @@ -70,7 +70,7 @@ are_atmclip_svcs_running() { start-stop-daemon --quiet --test --stop --pidfile /var/run/atmarpd.pid || return 1 - if [ "${clip_full:-yes}" = "yes" ]; then + if yesno ${clip_full:-yes}; then start-stop-daemon --quiet --test --stop --pidfile /var/run/ilmid.pid || return 1 start-stop-daemon --quiet --test --stop --pidfile /var/run/atmsigd.pid || return 1 fi diff --git a/net.Linux/vlan.sh b/net.Linux/vlan.sh index b3b82eab..2410b950 100644 --- a/net.Linux/vlan.sh +++ b/net.Linux/vlan.sh @@ -99,7 +99,7 @@ vlan_post_start() { # We may not want to start the vlan ourselves eval s=\$vlan_start_${IFVAR} - [ "${s:-yes}" != "yes" ] && continue + yesno ${s:-yes} || continue # We need to work out the interface name of our new vlan id local ifname="$( \ |