diff options
| -rwxr-xr-x | network-scripts/ifup | 4 | ||||
| -rwxr-xr-x | network-scripts/ifup-ippp | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/network-scripts/ifup b/network-scripts/ifup index 2c6d27ca..8ad78ef0 100755 --- a/network-scripts/ifup +++ b/network-scripts/ifup @@ -134,9 +134,7 @@ if is_true "${VLAN}" && is_false "$ISALIAS" && [ -n "$DEVICE" ]; then fi ip link add dev ${DEVICE} link ${PHYSDEV} type vlan id ${VID} ${FLAG_REORDER_HDR} ${FLAG_GVRP} || { - (/usr/bin/logger -p daemon.info -t ifup \ - $"ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}" &) & - net_log $"ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}" + net_log $"ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}" info ifup exit 1 } diff --git a/network-scripts/ifup-ippp b/network-scripts/ifup-ippp index b8df7c07..09214275 100755 --- a/network-scripts/ifup-ippp +++ b/network-scripts/ifup-ippp @@ -30,20 +30,20 @@ fi # check that ipppd is available for syncppp if [ "$ENCAP" = "syncppp" ]; then if [ ! -x /sbin/ipppd ] && [ ! -x /usr/sbin/ipppd ] ; then - /usr/bin/logger -p daemon.info -t ifup-ippp "ipppd does not exist or is not executable" + net_log $"ipppd does not exist or is not executable" info ifup-ippp exit 1 fi fi # check that isdnctrl is available if [ ! -x /sbin/isdnctrl ] && [ ! -x /usr/sbin/isdnctrl ] ; then - /usr/bin/logger -p daemon.info -t ifup-ippp "isdnctrl does not exist or is not executable" + net_log $"isdnctrl does not exist or is not executable" info ifup-ippp exit 1 fi # check all ISDN devices if ! isdnctrl list all >/dev/null 2>&1 ; then - /usr/bin/logger -p daemon.info -t ifup-ippp "cannot list ISDN devices" + net_log $"cannot list ISDN devices" info ifup-ippp exit 1 fi @@ -52,12 +52,12 @@ isdnctrl list $DEVICE >/dev/null 2>&1 && exit 0 function log_echo() { - /usr/bin/logger -p daemon.info -t ifup-ippp $"$*" + net_log $"$*" info ifup-ippp } function log_isdnctrl() { - /usr/bin/logger -p daemon.info -t ifup-ippp isdnctrl $* + net_log $"$*" info ifup-ippp isdnctrl $* >/dev/null 2>&1 || exit 1 } @@ -340,13 +340,13 @@ function addprovider() pfx=${val##PREFIX=} } # activate ISDN device - /usr/bin/logger -p daemon.info -t ifup-ippp "ip addr add $IPADDR peer $GATEWAY${pfx:/$pfx} dev $DEVICE" + net_log $"ip addr add $IPADDR peer $GATEWAY${pfx:/$pfx} dev $DEVICE" info ifup-ippp ip addr add $IPADDR peer $GATEWAY${pfx:/$pfx} dev $DEVICE ip link set dev $DEVICE up if [ "$ENCAP" = "syncppp" ]; then # start ipppd daemon - /usr/bin/logger -p daemon.info -t ifup-ippp "ipppd $options $netmask" + net_log $"ipppd $options $netmask" info ifup-ippp ipppd $options $netmask >/dev/null 2>&1 # start ibod daemon |