rc-scripts-dev_alias.patch

   1 --- ./rc.d/init.d/network.org   2005-03-29 20:06:05.823195832 +0200
   2 +++ ./rc.d/init.d/network       2005-03-29 20:06:53.540941632 +0200
   3 @@ -133,7 +133,7 @@
   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\.:]+$' | \
   9                 for i in `cat`; do \
  10                     ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \
  11                 done | \
  12 --- ./sysconfig/network-scripts/ifdown.org      2005-03-29 20:07:36.559401832 +0200
  13 +++ ./sysconfig/network-scripts/ifdown  2005-03-29 20:09:44.281985048 +0200
  14 @@ -109,8 +109,12 @@
  15         ip link set ${DEVICE} down
  16      fi
  17  else
  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}
  22 +    else
  23 +       ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
  24 +       ip link set ${DEVICE} down
  25 +    fi
  26  fi
  27
  28  if [ "$HANDLING" = "4" ]; then
  29 --- ./sysconfig/network-scripts/functions.network.org   2005-03-29 20:10:14.405405592 +0200
  30 +++ ./sysconfig/network-scripts/functions.network       2005-03-29 20:13:29.813699016 +0200
  31 @@ -148,7 +148,7 @@
  32  {
  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 } ')
  37  fi
  38
  39  # Setup DEVICETYPE for special cases.
  40 @@ -157,6 +157,7 @@
  41  fi
  42
  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 } ')
  46
  47  eval IP4ADDR="\$IPADDR${IP4_PRIM_IF:-}"
  48 --- ./sysconfig/network-scripts/ifup.org        2005-03-29 20:14:19.329171520 +0200
  49 +++ ./sysconfig/network-scripts/ifup    2005-03-29 20:16:31.832028024 +0200
  50 @@ -176,10 +176,14 @@
  51             IP4ADDROPT="brd + ${IP4ADDROPT}"
  52         fi
  53
  54 +       if [ -n "${SUBDEVICE}" ]; then
  55 +           ALIAS="label ${SUBDEVICE}"
  56 +       fi
  57 +
  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}
  61         else
  62 -           ip addr add ${IP4ADDR} dev ${DEVICE} ${IP4ADDROPT}
  63 +           ip addr add ${IP4ADDR} ${ALIAS} dev ${DEVICE} ${IP4ADDROPT}
  64         fi
  65      fi
  66