mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code

Revert "log /etc/init.d/networking errors into syslog using /usr/bin/logger"

Browse Source 
This reverts commit 99d97bfcd931d40b84387f073a6c1b16866fc1e2.
This commit is contained in:
Wilson Kok
2014-07-25 10:33:44 -07:00
parent 7ea57ea91f
commit 2e87a5b01a
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
init.d/networking
View File

@ -13,9 +13,6 @@ PATH="/sbin:/bin"
RUN_DIR="/run/network"
IFSTATE="$RUN_DIR/ifstate"
NAME=networking
SCRIPTNAME=/etc/init.d/$NAME
[ -x /sbin/ifup ] || exit 0
[ -x /sbin/ifdown ] || exit 0
@ -23,7 +20,6 @@ SCRIPTNAME=/etc/init.d/$NAME
CONFIGURE_INTERFACES=yes
EXCLUDE_INTERFACES=
REMOTE_SYSLOG_SERVER=
VERBOSE=no
verbose=
@ -51,20 +47,11 @@ gen_examples() {
return
}
is_bootup() {
# Return 0 if its bootup or return 1
[ -f /var/tmp/network/ifstatenew ] && return 1
return 0
}
perf_options() {
# At bootup lets set perfmode
if is_bootup ; then
echo -n "--perfmode"
else
echo -n ""
fi
[ -f /var/tmp/network/ifstatenew ] && echo -n "" && return
echo -n "--perfmode"
}
process_exclusions() {
@ -152,13 +139,12 @@ start)
exclusions=$(process_exclusions)
perfoptions=$(perf_options)
log_action_begin_msg "Configuring network interfaces"
if is_bootup ; then
ifup -a $verbose $perfoptions 2>&1 | /usr/bin/logger \
$REMOTE_SYSLOG_SERVER -s -i -t $SCRIPTNAME
if ifup -a $verbose $perfoptions
then
log_action_end_msg $?
else
ifup -a $verbose $perfoptions
log_action_end_msg $?
fi
log_action_end_msg $?
;;
stop)