Author: baggins
Date: Thu Mar 26 16:03:14 2009
New Revision: 10262
Modified:
rc-scripts/branches/busybox/sysconfig/network-scripts/functions.network
rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown
rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-br
rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-irda
rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-ppp
rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-vlan
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-aliases
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-br
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-ipx
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-irda
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-iucv
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-plip
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-plusb
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-post
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-ppp
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-sl
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-vlan
rc-scripts/branches/busybox/sysconfig/network-scripts/tnldown
rc-scripts/branches/busybox/sysconfig/network-scripts/tnlup
Log:
- always use /sbin/ip to avoid using bb applet
Modified:
rc-scripts/branches/busybox/sysconfig/network-scripts/functions.network
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/functions.network
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/functions.network
Thu Mar 26 16:03:14 2009
@@ -134,7 +134,7 @@
else
show "Setting static ARP entries"; busy
rc=0
- arpdev=$(ip link show | awk -F':' '(/UP/) && !
(/NOARP/) && ! (/lo:/) && ! (/NONE:/) { print $2; exit }')
+ arpdev=$(/sbin/ip link show | awk -F':' '(/UP/) && !
(/NOARP/) && ! (/lo:/) && ! (/NONE:/) { print $2; exit }')
if [ -z "$arpdev" ]; then
rc=1
else
@@ -253,7 +253,7 @@
check_device_down ()
{
- if LC_ALL=C ip link show dev ${DEVICE} 2> /dev/null | grep -q UP; then
+ if LC_ALL=C /sbin/ip link show dev ${DEVICE} 2> /dev/null | grep -q UP;
then
return 1
else
return 0
@@ -267,7 +267,7 @@
if [ -z "${GATEWAYDEV}" -o "${GATEWAYDEV}" = "${DEVICE}" ]; then
# set up default gateway
if [ "${GATEWAY}" ]; then
- ip -4 route add default via ${GATEWAY} dev
${DEVICE} ${IP4SRCADDR} onlink 2>/dev/null
+ /sbin/ip -4 route add default via ${GATEWAY}
dev ${DEVICE} ${IP4SRCADDR} onlink 2>/dev/null
if [ $? = 0 ]; then
DEFGW=${GATEWAY}
else
@@ -276,7 +276,7 @@
nls "Warning: Default gateway already
set proably via other interface. Do you need to setup GATEWAYDEV?"
fi
elif [ "${GATEWAYDEV}" = "${DEVICE}" ]; then
- ip -4 route add default dev ${DEVICE}
${IP4SRCADDR}
+ /sbin/ip -4 route add default dev ${DEVICE}
${IP4SRCADDR}
fi
fi
fi
@@ -286,18 +286,18 @@
if [ -z "${GATEWAY6DEV}" -o "${GATEWAY6DEV}" = "${DEVICE}" ];
then
# set up default gateway
if [ "${GATEWAY6}" ]; then
- ip -6 route add default via ${GATEWAY6} dev
${DEVICE} ${IP6SRCADDR} onlink
+ /sbin/ip -6 route add default via ${GATEWAY6}
dev ${DEVICE} ${IP6SRCADDR} onlink
DEFGW6=${GATEWAY6}
elif [ "${GATEWAY6DEV}" = "${DEVICE}" ]; then
- ip -6 route add default dev ${DEVICE}
${IP6SRCADDR}
+ /sbin/ip -6 route add default dev ${DEVICE}
${IP6SRCADDR}
fi
fi
if [ -z "${IPV6_GLOBALROUTEDEV}" -o "${IPV6_GLOBALROUTEDEV}" =
"${DEVICE}" ]; then
# set up default route
if [ "${IPV6_GLOBALROUTEGW}" ]; then
- ip -6 route add 2000::/3 via
${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR} onlink
+ /sbin/ip -6 route add 2000::/3 via
${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR} onlink
elif [ "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
- ip -6 route add 2000::/3 dev ${DEVICE}
${IP6SRCADDR}
+ /sbin/ip -6 route add 2000::/3 dev ${DEVICE}
${IP6SRCADDR}
fi
fi
fi
@@ -329,15 +329,15 @@
set_up_loopback()
{
if is_yes "$IPV4_NETWORKING"; then
- ip addr add 127.0.0.1/8 dev lo
+ /sbin/ip addr add 127.0.0.1/8 dev lo
fi
- ip link set dev lo up
+ /sbin/ip link set dev lo up
}
set_down_loopback()
{
- LC_ALL=C ip addr flush dev lo 2>&1 | grep -v "Nothing to flush"
- ip link set dev lo down
+ LC_ALL=C /sbin/ip addr flush dev lo 2>&1 | grep -v "Nothing to flush"
+ /sbin/ip link set dev lo down
}
modprobe_net()
@@ -448,7 +448,7 @@
done
elif is_no "$1"; then
LC_ALL=C /sbin/ip rule show | grep -vE -e "from all
lookup (main|default|local) \$" -e " map-to " | while read prio from src args;
do
- [ "$src" = "all" ] && ip rule delete $args ||
ip rule delete $from $src $args
+ [ "$src" = "all" ] && /sbin/ip rule delete
$args || /sbin/ip rule delete $from $src $args
done
fi
fi
@@ -589,8 +589,8 @@
check_link_down ()
{
if [ -x /sbin/mii-tool -o -x /sbin/ethtool -o -x /sbin/iwconfig ]; then
- if ! LC_ALL=C ip link show dev $1 2>/dev/null| grep -q UP ; then
- ip link set dev $1 up >/dev/null 2>&1
+ if ! LC_ALL=C /sbin/ip link show dev $1 2>/dev/null| grep -q UP
; then
+ /sbin/ip link set dev $1 up >/dev/null 2>&1
timeout=0
while [ $timeout -le 10 ]; do
check_mii_tool $1
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown Thu Mar
26 16:03:14 2009
@@ -108,9 +108,9 @@
check_device_down && exit 0
if [ -n "${SUBDEVICE}" ]; then
- ip addr del ${IP4ADDR} label ${SUBDEVICE} dev ${DEVICE}
+ /sbin/ip addr del ${IP4ADDR} label ${SUBDEVICE} dev ${DEVICE}
else
- LC_ALL=C ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
+ LC_ALL=C /sbin/ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to
flush"
if [ ${DEVICETYPE} = "bond" ]; then
if [ ! -x /sbin/ifenslave ]; then
@@ -120,7 +120,7 @@
# get up the bonding device before enslaving
if ! check_device_down "${DEVICE}"; then
- ip link set ${DEVICE} up
+ /sbin/ip link set ${DEVICE} up
fi
for BSVAR in $(awk '/Slave Interface:/{ print $3}'
/proc/net/bonding/${DEVICE}); do
@@ -130,7 +130,7 @@
done
fi
- ip link set ${DEVICE} down
+ /sbin/ip link set ${DEVICE} down
fi
if [ "$HANDLING" = "4" ]; then
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-br
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-br
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-br Thu Mar
26 16:03:14 2009
@@ -42,10 +42,10 @@
# set device down and forget all addresses
for device in ${BRIDGE_DEVS}; do
- LC_ALL=C ip addr flush dev ${device} 2>&1 | grep -v "Nothing to flush"
- ip link set ${device} down
+ LC_ALL=C /sbin/ip addr flush dev ${device} 2>&1 | grep -v "Nothing to
flush"
+ /sbin/ip link set ${device} down
brctl delif ${DEVICE} ${device}
done
-ip link set ${DEVICE} down
+/sbin/ip link set ${DEVICE} down
brctl delbr ${DEVICE}
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-irda
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-irda
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-irda Thu Mar
26 16:03:14 2009
@@ -38,8 +38,8 @@
# set all major variables
setup_ip_param
-ip link set ${DEVICE} down
-ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
+/sbin/ip link set ${DEVICE} down
+/sbin/ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
PID=$(pidof irattach)
for x in $PID; do
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-ppp
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-ppp
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-ppp Thu Mar
26 16:03:14 2009
@@ -46,7 +46,7 @@
fi
if [ -x $EAGLECTRL ]; then
PPPOA_IFACE=$( $EAGLECTRL -i 2>/dev/null)
- [ -n "$PPPOA_IFACE" ] && ip link set "$PPPOA_IFACE" down
+ [ -n "$PPPOA_IFACE" ] && /sbin/ip link set "$PPPOA_IFACE" down
fi
fi
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-vlan
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-vlan
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifdown-vlan Thu Mar
26 16:03:14 2009
@@ -36,10 +36,10 @@
# set all major variables
setup_ip_param
-ip link set ${DEVICE} down
-LC_ALL=C ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
+/sbin/ip link set ${DEVICE} down
+LC_ALL=C /sbin/ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
-if LC_ALL=C ip link help 2>&1 | grep -q del; then
+if LC_ALL=C /sbin/ip link help 2>&1 | grep -q del; then
/sbin/ip link del ${DEVICE}
elif [ -x /sbin/vconfig ]; then
/sbin/vconfig rem ${DEVICE}
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup (original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup Thu Mar 26
16:03:14 2009
@@ -78,8 +78,8 @@
fi
if [ -n "$MACVLAN_DEV" -a -n "$MACVLAN_MACADDR" ]; then
- ip link del link ${MACVLAN_DEV} ${DEVICE} type macvlan > /dev/null 2>&1
- ip link add link ${MACVLAN_DEV} address ${MACVLAN_MACADDR} ${DEVICE}
type macvlan
+ /sbin/ip link del link ${MACVLAN_DEV} ${DEVICE} type macvlan >
/dev/null 2>&1
+ /sbin/ip link add link ${MACVLAN_DEV} address ${MACVLAN_MACADDR}
${DEVICE} type macvlan
fi
# is this device available? (this catches PCMCIA devices for us)
@@ -96,7 +96,7 @@
if is_yes "$SLAVE" && [ -n "$MASTER" -a -x /sbin/ifenslave ]; then
RFLAG="" && is_yes "${RECIEVE-ONLY}" && RFLAG="-r"
- ip link set ${DEVICE} down
+ /sbin/ip link set ${DEVICE} down
nls "Enslaving %s to %s" "$DEVICE" "$MASTER"
ifenslave $RFLAG "$MASTER" "$DEVICE"
@@ -104,13 +104,13 @@
fi
if [ -n "$MACADDR" ]; then
- ip link set ${DEVICE} address ${MACADDR}
+ /sbin/ip link set ${DEVICE} address ${MACADDR}
fi
-ip link set ${DEVICE} multicast ${MULTICAST} ${ARP} down
+/sbin/ip link set ${DEVICE} multicast ${MULTICAST} ${ARP} down
if [ -n "$MTU" ]; then
- ip link set ${DEVICE} mtu ${MTU}
+ /sbin/ip link set ${DEVICE} mtu ${MTU}
fi
if is_yes "${IPV6_NETWORKING}" && is_yes "${IPV6_DISABLE_AUTOCONF}"; then
@@ -118,7 +118,7 @@
fi
if is_wireless_device "${DEVICE}"; then
- is_yes "${WLAN_UPEARLY}" && ip link set ${DEVICE} up
+ is_yes "${WLAN_UPEARLY}" && /sbin/ip link set ${DEVICE} up
wireless_param ${DEVICE}
fi
@@ -172,7 +172,7 @@
# give time for determining IP information
check_device_down && sleep 1 && check_device_down && sleep 3
- check_device_down && ip link set ${DEVICE} up
+ check_device_down && /sbin/ip link set ${DEVICE} up
fi
else
# IPv4 in use ?
@@ -187,20 +187,20 @@
fi
if [ -n "$REMIP" ]; then
- ip addr add ${IP4ADDR} peer ${REMIP} ${ALIAS} dev
${DEVICE} ${IP4ADDROPT}
+ /sbin/ip addr add ${IP4ADDR} peer ${REMIP} ${ALIAS} dev
${DEVICE} ${IP4ADDROPT}
else
- ip addr add ${IP4ADDR} ${ALIAS} dev ${DEVICE}
${IP4ADDROPT}
+ /sbin/ip addr add ${IP4ADDR} ${ALIAS} dev ${DEVICE}
${IP4ADDROPT}
fi
fi
# Set device up
- ip link set ${DEVICE} up
+ /sbin/ip link set ${DEVICE} up
# IPv6 in use ?
if is_yes "$IPV6_NETWORKING" && [ -n "${IP6ADDR}" ]; then
- ip addr add ${IP6ADDR} dev ${DEVICE} ${IP6ADDROPT}
+ /sbin/ip addr add ${IP6ADDR} dev ${DEVICE} ${IP6ADDROPT}
if [ -n "${IP6ADDRLABEL}" ]; then
- ip addrlabel add prefix ${IP6ADDR} dev ${DEVICE} label
${IP6ADDRLABEL}
+ /sbin/ip addrlabel add prefix ${IP6ADDR} dev ${DEVICE}
label ${IP6ADDRLABEL}
fi
fi
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-aliases
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-aliases
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-aliases Thu Mar
26 16:03:14 2009
@@ -10,12 +10,12 @@
[ -z "$IP_ADDR" ] && continue
# Be sure that primary address is added
if [ "$IP_ADDR" = "$IP4ADDR" -o "$IP_ADDR" = "$IP6ADDR" ]; then
- if (ip addr show dev $DEVICE | grep -qE
"[[:space:]]${IP_ADDR}[[:space:]]"); then
+ if (/sbin/ip addr show dev $DEVICE | grep -qE
"[[:space:]]${IP_ADDR}[[:space:]]"); then
continue
fi
fi
if is_yes "${IPV4_NETWORKING}"; then
- ip -4 addr add ${IP_ADDR} dev ${DEVICE} brd +
+ /sbin/ip -4 addr add ${IP_ADDR} dev ${DEVICE} brd +
fi
done
@@ -23,17 +23,17 @@
[ -z "$IP_ADDR" ] && continue
# Be sure that primary address is added
if [ "$IP_ADDR" = "$IP4ADDR" -o "$IP_ADDR" = "$IP6ADDR" ]; then
- if (ip addr show dev $DEVICE | grep -qE
"[[:space:]]${IP_ADDR}[[:space:]]"); then
+ if (/sbin/ip addr show dev $DEVICE | grep -qE
"[[:space:]]${IP_ADDR}[[:space:]]"); then
continue
fi
fi
# Check for IPv6 address
if (echo $IP_ADDR | grep -q ":"); then
if is_yes "${IPV6_NETWORKING}"; then
- ip -6 addr add ${IP_ADDR} dev ${DEVICE}
+ /sbin/ip -6 addr add ${IP_ADDR} dev ${DEVICE}
fi
elif is_yes "${IPV4_NETWORKING}"; then
- ip -4 addr add ${IP_ADDR} dev ${DEVICE} brd +
+ /sbin/ip -4 addr add ${IP_ADDR} dev ${DEVICE} brd +
fi
done
@@ -47,33 +47,35 @@
# Be sure that primary address is added
if [ "$IP_ADDR" = "$IP4ADDR" -o "$IP_ADDR" = "$IP6ADDR" ]; then
- if (ip addr show dev $DEVICE | grep -qE
"[[:space:]]${IP_ADDR}[[:space:]]"); then
+ if (/sbin/ip addr show dev $DEVICE | grep -qE
"[[:space:]]${IP_ADDR}[[:space:]]"); then
continue
fi
fi
# Check for IPv6 address
if echo $IP_ADDR | grep -q ":"; then
if is_yes "${IPV6_NETWORKING}"; then
- ip -6 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
- [ -n "${IP_ADDR_LABEL}" ] && ip -6 addrlabel add prefix
${IP_ADDR} dev ${DEVICE} label ${IP_ADDR_LABEL}
+ /sbin/ip -6 addr add ${IP_ADDR} dev ${DEVICE}
${IP_ADDR_OPT}
+ if [ -n "${IP_ADDR_LABEL}" ]; then
+ /sbin/ip -6 addrlabel add prefix ${IP_ADDR} dev
${DEVICE} label ${IP_ADDR_LABEL}
+ fi
fi
elif is_yes "${IPV4_NETWORKING}"; then
# If broadcast is missing then autocalculate it
if ! (echo $IP_ADDR_OPT | grep -qE "brd|broadcast"); then
IP_ADDR_OPT="brd + ${IP_ADDR_OPT}"
fi
- ip -4 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
+ /sbin/ip -4 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
fi
done
# Setup IPv4-compatible addresses
if is_yes "$IPV6_NETWORKING" && [ "$BOOTPROTO6" = "v4compat" ]; then
# enable automatic tunnels
- ip link set sit0 up
+ /sbin/ip link set sit0 up
# add v4compat addresses to device
- for addr in $(ip -4 addr show scope global dev $DEVICE | \
+ for addr in $(/sbin/ip -4 addr show scope global dev $DEVICE | \
awk '/inet/ { print $2 }' | awk -F"/" '{ print $1 }'); do
- ip -6 addr add ::$addr dev $DEVICE
+ /sbin/ip -6 addr add ::$addr dev $DEVICE
done
fi
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-br
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-br
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-br Thu Mar
26 16:03:14 2009
@@ -45,8 +45,8 @@
# set device down and forget all addresses
for device in $BRIDGE_DEVS; do
- ip link set ${device} down
- LC_ALL=C ip addr flush dev ${device} 2>&1 | grep -v "Nothing to flush"
+ /sbin/ip link set ${device} down
+ LC_ALL=C /sbin/ip addr flush dev ${device} 2>&1 | grep -v "Nothing to
flush"
done
# set wireless parameters
@@ -61,8 +61,8 @@
# add interfaces to bridge
for device in $BRIDGE_DEVS; do
brctl addif ${DEVICE} ${device}
- ip link set dev ${device} multicast ${MULTICAST} ${ARP}
- ip link set ${device} up
+ /sbin/ip link set dev ${device} multicast ${MULTICAST} ${ARP}
+ /sbin/ip link set ${device} up
done
@@ -83,8 +83,8 @@
brctl stp ${DEVICE} no
fi
-ip link set dev ${DEVICE} multicast ${MULTICAST} ${ARP}
-if ! (ip link set dev ${DEVICE} up); then
+/sbin/ip link set dev ${DEVICE} multicast ${MULTICAST} ${ARP}
+if ! (/sbin/ip link set dev ${DEVICE} up); then
nls "problems with setting bridge %s" "${DEVICE}"
exit 1
fi
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-ipx
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-ipx
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-ipx Thu Mar
26 16:03:14 2009
@@ -42,7 +42,7 @@
yes|true) primary="-p" ;;
*) primary= ;;
esac
- ip link set $DEVICE up
+ /sbin/ip link set $DEVICE up
/sbin/ipx_interface add $primary $DEVICE $frametype \
$(eval echo $(echo \$$(echo IPXNETNUM_$framename)))
;;
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-irda
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-irda
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-irda Thu Mar
26 16:03:14 2009
@@ -55,8 +55,8 @@
/sbin/irattach ${IRDAPORT} ${IRDAOPTS}
-ip link set dev ${DEVICE} multicast ${MULTICAST} ${ARP}
-if ! (ip link set dev ${DEVICE} up); then
+/sbin/ip link set dev ${DEVICE} multicast ${MULTICAST} ${ARP}
+if ! (/sbin/ip link set dev ${DEVICE} up); then
nls "problems with setting %s %s" "IrDA" "${DEVICE}"
exit 1
fi
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-iucv
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-iucv
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-iucv Thu Mar
26 16:03:14 2009
@@ -21,17 +21,17 @@
if is_yes "$IPV4_NETWORKING"; then
if [ -n "$IP4ADDR" ]; then
- ip -4 addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE}
+ /sbin/ip -4 addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE}
fi
fi
if is_yes "$IPV6_NETWORKING"; then
if [ -n "$IP6ADDR" ]; then
- ip -6 addr add ${IP6ADDR} dev ${DEVICE}
+ /sbin/ip -6 addr add ${IP6ADDR} dev ${DEVICE}
fi
fi
-ip link set dev ${DEVICE} up
+/sbin/ip link set dev ${DEVICE} up
. /etc/sysconfig/network
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-plip
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-plip
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-plip Thu Mar
26 16:03:14 2009
@@ -20,17 +20,17 @@
if is_yes "$IPV4_NETWORKING"; then
if [ -n "$IP4ADDR" ]; then
- ip -4 addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE}
+ /sbin/ip -4 addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE}
fi
fi
if is_yes "$IPV6_NETWORKING"; then
if [ -n "$IP6ADDR" ]; then
- ip -6 addr add ${IP6ADDR} dev ${DEVICE}
+ /sbin/ip -6 addr add ${IP6ADDR} dev ${DEVICE}
fi
fi
-ip link set dev ${DEVICE} up
+/sbin/ip link set dev ${DEVICE} up
. /etc/sysconfig/network
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-plusb
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-plusb
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-plusb Thu Mar
26 16:03:14 2009
@@ -29,17 +29,17 @@
if is_yes "$IPV4_NETWORKING"; then
if [ -n "$IP4ADDR" ]; then
- ip -4 addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE}
+ /sbin/ip -4 addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE}
fi
fi
if is_yes "$IPV6_NETWORKING"; then
if [ -n "$IP6ADDR" ]; then
- ip -6 addr add ${IP6ADDR} dev ${DEVICE}
+ /sbin/ip -6 addr add ${IP6ADDR} dev ${DEVICE}
fi
fi
-ip link set dev ${DEVICE} up
+/sbin/ip link set dev ${DEVICE} up
. /etc/sysconfig/network
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-post
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-post
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-post Thu Mar
26 16:03:14 2009
@@ -58,7 +58,7 @@
# don't set hostname on ppp/slip connections
if [ -n "$NEEDHOSTNAME" -a "${DEVICETYPE}" != "ppp" -a "${DEVICETYPE}" !=
"slip" ]; then
- IPADDR=$(ip -f inet addr show dev ${DEVICE} |
+ IPADDR=$(/sbin/ip -f inet addr show dev ${DEVICE} |
awk '/inet/ { print $2 }' |awk -F"/" '{ print $1 }')
eval $(ipcalc -s -h ${IPADDR}) && set_hostname $HOSTNAME
fi
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-ppp
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-ppp
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-ppp Thu Mar
26 16:03:14 2009
@@ -73,7 +73,7 @@
if [ -z "$PPPOA_IFACE" ]; then
PPPOA_IFACE="(unknown)"
else
- ip link set "$PPPOA_IFACE" up
+ /sbin/ip link set "$PPPOA_IFACE" up
fi
MODEMMODE="pty"
MODEMPORT="pppoa -I ${PPPOA_IFACE} ${PPPOA_OPT}"
@@ -179,7 +179,7 @@
if is_yes "${DEFROUTE}"; then
# pppd will no longer delete an existing default route
# so we have to help it out a little here.
- ip route del 0/0 > /dev/null 2>&1
+ /sbin/ip route del 0/0 > /dev/null 2>&1
opts="$opts defaultroute"
elif ! is_no "${DEFROUTE}"; then
opts="$opts defaultroute"
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-sl
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-sl
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-sl Thu Mar
26 16:03:14 2009
@@ -98,17 +98,17 @@
if is_yes "$IPV4_NETWORKING"; then
if [ -n "$IP4ADDR" -a -n "$REMIP" ]; then
# Peer is only for IPv4
- ip -4 addr add $IP4ADDR peer $REMIP dev $DEVICE
+ /sbin/ip -4 addr add $IP4ADDR peer $REMIP dev $DEVICE
fi
fi
if is_yes "$IPV6_NETWORKING"; then
if [ -n "$IP6ADDR" ]; then
- ip -6 addr add $IP6ADDR dev $DEVICE
+ /sbin/ip -6 addr add $IP6ADDR dev $DEVICE
fi
fi
- ip link set $DEVICE mtu $MTU up
+ /sbin/ip link set $DEVICE mtu $MTU up
# IPv4/6 gateways and default routes
setup_ip_gw_ro
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-vlan
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-vlan
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-vlan Thu Mar
26 16:03:14 2009
@@ -61,7 +61,7 @@
# set all major variables
setup_ip_param
-if (LC_ALL=C ip link add type vlan help 2>&1 | grep -q "VLANID :="); then
+if (LC_ALL=C /sbin/ip link add type vlan help 2>&1 | grep -q "VLANID :="); then
/sbin/ip link set ${VLAN_DEV} up
/sbin/ip link add link ${VLAN_DEV} name ${DEVICE} type vlan id
${VLAN_ID}
# default yes
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/tnldown
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/tnldown
(original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/tnldown Thu Mar
26 16:03:14 2009
@@ -69,12 +69,12 @@
case "${MODE}" in
ipip|sit|gre)
- ip link set ${DEVICE} down
- ip tunnel del ${DEVICE}
+ /sbin/ip link set ${DEVICE} down
+ /sbin/ip tunnel del ${DEVICE}
RESULT=$?
;;
four)
- ip link set ${DEVICE} down
+ /sbin/ip link set ${DEVICE} down
fourcfg del ${DEVICE}
RESULT=$?
;;
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/tnlup
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/tnlup (original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/tnlup Thu Mar 26
16:03:14 2009
@@ -114,12 +114,12 @@
case "${MODE}" in
ipip|sit)
- ip tunnel add ${DEVICE} mode ${MODE} local ${LOCALADDR} \
+ /sbin/ip tunnel add ${DEVICE} mode ${MODE} local ${LOCALADDR} \
remote ${REMOTEADDR} ${TTL} ${TOS} ${PMTUDISC} ${BIND_DEV}
RESULT=$?
;;
gre)
- ip tunnel add ${DEVICE} mode ${MODE} local ${LOCALADDR} \
+ /sbin/ip tunnel add ${DEVICE} mode ${MODE} local ${LOCALADDR} \
remote ${REMOTEADDR} ${TTL} ${TOS} ${PMTUDISC} ${BIND_DEV} \
${CSUM} ${ISEQ} ${KEY} ${IKEY} ${OKEY}
RESULT=$?
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
