1 --- ./rc.d/init.d/network.org Fri Aug 20 14:16:03 2004
2 +++ ./rc.d/init.d/network Thu Sep 16 13:48:42 2004
4 . /etc/rc.d/init.d/functions; \
5 cd /etc/sysconfig/interfaces && ls -1 ifcfg* | \
6 egrep -v '(ifcfg-lo|ifcfg-sit|ifcfg-atm|ifcfg-lec|ifcfg-nas|ifcfg-br|ifcfg-(.*)\.(.*))' | \
7 - egrep 'ifcfg-[a-z0-9\.]+$' | \
8 + egrep 'ifcfg-[a-z0-9\.:]+$' | \
10 ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \
12 --- ./sysconfig/network-scripts/ifdown.org Sun Jul 4 17:18:07 2004
13 +++ ./sysconfig/network-scripts/ifdown Thu Sep 16 13:51:01 2004
15 ip link set ${DEVICE} down
18 - ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
19 - ip link set ${DEVICE} down
20 + if [ -n "${SUBDEVICE}" ]; then
21 + ip addr del ${IP4ADDR} label ${SUBDEVICE} dev ${DEVICE}
23 + ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
24 + ip link set ${DEVICE} down
28 if [ "$HANDLING" = "4" ]; then
29 --- ./sysconfig/network-scripts/functions.network.org Sun Jul 4 19:22:50 2004
30 +++ ./sysconfig/network-scripts/functions.network Thu Sep 16 13:49:12 2004
33 # detect network device type (ie. dummy, eth for dummy0, eth0 ..)
34 if [ -z "$DEVICETYPE" ]; then
35 - DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*\.?[0-9]*$/,NUL); print $0 } ')
36 + DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*\.?:?[0-9]*$/,NUL); print $0 } ')
39 # Setup DEVICETYPE for special cases.
43 # real name of device (ie. is eth0 for eth0,eth0:1,eth0:alias)
44 +SUBDEVICE=$(echo "$DEVICE" | egrep "([0-9]+:[0-9]+)" )
45 DEVICE=$(echo $DEVICE | awk ' { gsub(/:.*$/,NUL); print $0 } ')
47 eval IP4ADDR="\$IPADDR${IP4_PRIM_IF:-}"
48 --- ./sysconfig/network-scripts/ifup.org Sun Jul 4 17:18:08 2004
49 +++ ./sysconfig/network-scripts/ifup Thu Sep 16 13:55:01 2004
51 IP4ADDROPT="brd + ${IP4ADDROPT}"
54 + if [ -n "${SUBDEVICE}" ]; then
55 + ALIAS="label ${SUBDEVICE}"
58 if [ -n "$REMIP" ]; then
59 - ip addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE} ${IP4ADDROPT}
60 + ip addr add ${IP4ADDR} peer ${REMIP} ${ALIAS} dev ${DEVICE} ${IP4ADDROPT}
62 - ip addr add ${IP4ADDR} dev ${DEVICE} ${IP4ADDROPT}
63 + ip addr add ${IP4ADDR} ${ALIAS} dev ${DEVICE} ${IP4ADDROPT}