X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=rrqnet-ifupdown.sh;h=25517fab20f2c792af802f2f15cbe40872953aa9;hb=366ba17d29cb049621d5f029cc9bdf60fb627d37;hp=6c33d5fa38aeb50dda9374eb30333e327926cf8c;hpb=14dc269a84ae307b2e07364183d3d677064e5a85;p=rrq%2Frrqnet.git

diff --git a/rrqnet-ifupdown.sh b/rrqnet-ifupdown.sh
index 6c33d5f..25517fa 100755
--- a/rrqnet-ifupdown.sh
+++ b/rrqnet-ifupdown.sh
@@ -20,10 +20,12 @@
 # An rrqnet stanza may have the following settings:
 # rrqnet_port <port>
 # rrqnet_remote <remote declaration>
-# rrqnet_bridge <bridge>
+# rrqnet_options <options>
 # rrqnet_log <level> <pathname>
+# rrqnet_bridge <bridge>
 
 : ${RRQDAEMON:=/usr/local/sbin/rrqnet}
+: ${NAME:=rrqnet-${IFACE}}
 
 #function
 configure_tap_bridge() {
@@ -38,14 +40,14 @@ configure_tap_up() {
 	grep -q "state UP" || ip link set dev $IFACE up
 }
 
-#function <env> start_cable <loglevel> <logfile>
+#function
 start_cable_pre_up() {
-    configure_tap_up
-    NAME="rrqnet-$IFACE"
+    configure_tap_up || return 1
+    configure_tap_bridge || return 1
     if [ -z "$IF_RRQNET_LOG" ] ; then
 	daemon -U -r -n $NAME -- \
 	       $RRQDAEMON $IF_RRQNET_OPTIONS \
-	       -t $IFACE $IF_RRQNET $IF_RRQNET_REMOTE
+	       -t $IFACE $IF_RRQNET_PORT $IF_RRQNET_REMOTE
     else
 	daemon -U -r -n $NAME -E "${IF_RRQNET_LOG#* }" -- \
 	       $RRQDAEMON ${IF_RRQNET_LOG%% *} $IF_RRQNET_OPTIONS \
@@ -53,35 +55,16 @@ start_cable_pre_up() {
     fi
 }
 
-#function
-start_cable_post_up() {
-    configure_tap_bridge
-}
-
-#function
-stop_cable_pre_down() {
-    :
-}
-
 #function
 stop_cable_post_down() {
-    NAME="rrqnet-$IFACE"
     daemon -n $NAME --stop
 }
 
 # main script body
 
 case "$MODE-$PHASE" in
-    start-pre-up)
-	start_cable_pre_up
-	;;
-    start-post-up)
-	start_cable_post_up
-	;;
-    stop-pre-down)
-	:
-	;;
-    stop-post-down)
-	stop_cable_post_down
-	;;
+    start-pre-up) start_cable_pre_up ;;
+    start-post-up) : ;;
+    stop-pre-down) : ;;
+    stop-post-down) stop_cable_post_down ;;
 esac