X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=rrqnet-ifupdown.sh;h=99e45df714d73a79037fea62b5a9357368b270a0;hb=refs%2Ftags%2F1.6.2;hp=157007a9ad21f32271710d6b27bcecd83c1558e8;hpb=3ea171c085b92fb6cf260dd3d33e8ef83ea0ba56;p=rrq%2Frrqnet.git

diff --git a/rrqnet-ifupdown.sh b/rrqnet-ifupdown.sh
index 157007a..99e45df 100755
--- a/rrqnet-ifupdown.sh
+++ b/rrqnet-ifupdown.sh
@@ -68,19 +68,6 @@ stop_dhclient() {
 ############################################################
 ## The action functions
 
-QUIRK=
-LOGFLAG=
-LOGFILE=
-#function
-process_logoption() {
-    if [ -n "${1##-v*}" ] ; then
-	QUIRK="$1"
-	shift
-    fi
-    LOGFLAG="$1"
-    LOGFILE="$2"
-}
-
 #function
 start_cable_pre_up() {
     local TAP
@@ -94,14 +81,14 @@ start_cable_pre_up() {
     fi
     [ -z "$IF_RRQNET_NICE" ] || \
         RRQDAEMON="/usr/bin/nice -n $IF_RRQNET_NICE $RRQDAEMON"
-    process_logoption ${IF_RRQNET_LOG}
-    if [ -z "$LOGFILE" ] ; then
+    if [ -z "$IF_RRQNET_LOG" ] ; then
 	daemon -U -r -a 10 -n $NAME -- \
-	       $RRQDAEMON $QUIRK $IF_RRQNET_OPTIONS \
+	       $RRQDAEMON $IF_RRQNET_OPTIONS \
 	       $TAP $IF_RRQNET_PORT $IF_RRQNET_REMOTE
     else
-	daemon -U -r -a 10 -n $NAME -E "$LOGFILE" -- \
-	       $RRQDAEMON $QUIRK $LOGFLAG $IF_RRQNET_OPTIONS \
+        LOG=${IF_RRQNET_LOG#* }
+        daemon -U -r -a 10 -n $NAME -E "$LOG" -- \
+               $RRQDAEMON ${IF_RRQNET_LOG%$LOG} $IF_RRQNET_OPTIONS \
 	       $TAP $IF_RRQNET_PORT $IF_RRQNET_REMOTE
     fi
 }