projects
/
rrq
/
rrqnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow logging without -v
[rrq/rrqnet.git]
/
rrqnet-ifupdown.sh
diff --git
a/rrqnet-ifupdown.sh
b/rrqnet-ifupdown.sh
index 157007a9ad21f32271710d6b27bcecd83c1558e8..99e45df714d73a79037fea62b5a9357368b270a0 100755
(executable)
--- a/
rrqnet-ifupdown.sh
+++ b/
rrqnet-ifupdown.sh
@@
-68,19
+68,6
@@
stop_dhclient() {
############################################################
## The action functions
############################################################
## 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
#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"
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 -- \
daemon -U -r -a 10 -n $NAME -- \
- $RRQDAEMON $
QUIRK $
IF_RRQNET_OPTIONS \
+ $RRQDAEMON $IF_RRQNET_OPTIONS \
$TAP $IF_RRQNET_PORT $IF_RRQNET_REMOTE
else
$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
}
$TAP $IF_RRQNET_PORT $IF_RRQNET_REMOTE
fi
}