rc-scripts-dev_alias.patch

   1 --- ./sysconfig/network-scripts/ifdown.org      2005-03-29 20:07:36.559401832 +0200
   2 +++ ./sysconfig/network-scripts/ifdown  2005-03-29 20:09:44.281985048 +0200
   3 @@ -109,8 +109,12 @@
   4                 ip link set ${DEVICE} down
   5         fi
   6  else
   7 -       ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
   8 -       ip link set ${DEVICE} down
   9 +       if [ -n "${SUBDEVICE}" ]; then
  10 +               ip addr del ${IP4ADDR} label ${SUBDEVICE} dev ${DEVICE}
  11 +       else
  12 +               ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
  13 +               ip link set ${DEVICE} down
  14 +       fi
  15  fi
  16
  17  if [ "$HANDLING" = "4" ]; then
  18 --- ./sysconfig/network-scripts/functions.network.org   2005-03-29 20:10:14.405405592 +0200
  19 +++ ./sysconfig/network-scripts/functions.network       2005-03-29 20:13:29.813699016 +0200
  20 @@ -148,7 +148,7 @@
  21  {
  22         # detect network device type (ie. dummy, eth for dummy0, eth0 ..)
  23         if [ -z "$DEVICETYPE" ]; then
  24 -               DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*\.?[0-9]*$/,NUL); print $0 } ')
  25 +               DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[\.:]?[0-9]*[\.:]?[0-9]*$/,NUL); print $0 } ')
  26         fi
  27
  28  # Setup DEVICETYPE for special cases.
  29 @@ -157,6 +157,7 @@
  30  fi
  31
  32         # real name of device (ie. is eth0 for eth0,eth0:1,eth0:alias)
  33 +       SUBDEVICE=$(echo "$DEVICE" | egrep "([0-9]+:[0-9]+)" )
  34         DEVICE=$(echo $DEVICE | awk ' { gsub(/:.*$/,NUL); print $0 } ')
  35
  36         eval IP4ADDR="\$IPADDR${IP4_PRIM_IF:-}"
  37 --- ./sysconfig/network-scripts/ifup.org        2005-03-29 20:14:19.329171520 +0200
  38 +++ ./sysconfig/network-scripts/ifup    2005-03-29 20:16:31.832028024 +0200
  39 @@ -176,10 +176,14 @@
  40                         IP4ADDROPT="brd + ${IP4ADDROPT}"
  41                 fi
  42
  43 +               if [ -n "${SUBDEVICE}" ]; then
  44 +                       ALIAS="label ${SUBDEVICE}"
  45 +               fi
  46 +
  47                 if [ -n "$REMIP" ]; then
  48 -                       ip addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE} ${IP4ADDROPT}
  49 +                       ip addr add ${IP4ADDR} peer ${REMIP} ${ALIAS} dev ${DEVICE} ${IP4ADDROPT}
  50                 else
  51 -                       ip addr add ${IP4ADDR} dev ${DEVICE} ${IP4ADDROPT}
  52 +                       ip addr add ${IP4ADDR} ${ALIAS} dev ${DEVICE} ${IP4ADDROPT}
  53                 fi
  54         fi
  55