From: Ralph Ronnquist <ralph.ronnquist@gmail.com>
Date: Tue, 2 Nov 2021 21:10:55 +0000 (+1100)
Subject: update for new -tpg argument
X-Git-Tag: 1.5.2
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=a6238294b80a2d98d3768131a457d00f4b2b9578;hp=9fad9dd8a80331dbe77e3d1a52576fa4f00cf206;p=rrq%2Frrqnet.git

update for new -tpg argument
---

diff --git a/rrqnet-ifupdown.sh b/rrqnet-ifupdown.sh
index 157007a..4c6ce4d 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,13 @@ 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 \
+	daemon -U -r -a 10 -n $NAME -E "${IF_RRQNET_LOG#* }" -- \
+	       $RRQDAEMON ${IF_RRQNET_LOG%% *} $IF_RRQNET_OPTIONS \
 	       $TAP $IF_RRQNET_PORT $IF_RRQNET_REMOTE
     fi
 }
diff --git a/rrqnet-ifupdown.sh.8.adoc b/rrqnet-ifupdown.sh.8.adoc
index 90a502c..3bca616 100644
--- a/rrqnet-ifupdown.sh.8.adoc
+++ b/rrqnet-ifupdown.sh.8.adoc
@@ -62,8 +62,8 @@ remotes for a single +rrqnet+ daemon are declared by using multiple
 *rrqnet_options* _options_::
 
 This IFACE option is used for declaring any additional +rrqnet+ daemon
-settings ([-4] [-B n] [-T n] [-m mcast]). Refer to the +rrqnet+ man
-page for the full specification.
+settings ([-tpg] [-4] [-B n] [-T n] [-m mcast]). Refer to the +rrqnet+
+man page for the full specification.
 
 *rrqnet_log* _level_ _pathname_::