From 45aa75e895aa0da3f06caf98369a03e7c2e21276 Mon Sep 17 00:00:00 2001 From: Wilson Kok Date: Sun, 27 Jul 2014 21:28:46 -0700 Subject: [PATCH] Revert "log /etc/init.d/networking errors into syslog using /usr/bin/logger" This reverts commit 99d97bfcd931d40b84387f073a6c1b16866fc1e2. --- init.d/networking | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/init.d/networking b/init.d/networking index 912683e..aa9ce1a 100644 --- a/init.d/networking +++ b/init.d/networking @@ -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)