diff options
| -rwxr-xr-x | sysconfig/network-scripts/ifup-aliases | 41 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-routes | 21 |
2 files changed, 10 insertions, 52 deletions
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases index 8353a751..163492c3 100755 --- a/sysconfig/network-scripts/ifup-aliases +++ b/sysconfig/network-scripts/ifup-aliases @@ -8,46 +8,11 @@ if [ "$device" = "" ]; then exit 1 fi -# don't run linuxconf if /usr isn't there... -# -# Heck, it's broken. Don't run linuxconf at all. -# -#if [ -x /bin/linuxconf -a -f /usr/lib/libncurses.so.4.2 ] ; then -# # ask linuxconf for lines like: -# # add <device> <ip> -# # del <device> -# # reload <number_of_aliases> -# linuxconf --hint ipalias $1 | while read verb arg1 arg2 arg3 arg4; do -# case $verb in -# add) -# if [ -z "$arg3" ] ; then -# # old linuxconf -# /sbin/ifconfig $arg1 $arg2 -# else -# # new linuxconf -# /sbin/ifconfig $arg1 $arg2 netmask $arg3 broadcast $arg4 -# fi -# ;; -# del) -# # the <device> 0.0.0.0 tells the kernel to remove the device -# # it is necessary to remove it in order for reload to work. -# /sbin/ifconfig ${arg1} 0.0.0.0 -# ;; -# reload) -# echo $arg1 > /proc/sys/net/core/net_alias_max -# ;; -# esac -# done -# -#else - # we don't have linuxconf to fall back on, so presumably we do - # not have to parse linuxconf ipalias ranges, either. - current=0 - while : ; do +current=0 +while : ; do if [ ! -f /etc/sysconfig/network-scripts/$device:$current ]; then return fi /etc/sysconfig/network-scripts/ifup $device:$current current=`expr $current + 1` - done -#fi +done diff --git a/sysconfig/network-scripts/ifup-routes b/sysconfig/network-scripts/ifup-routes index b623cfd9..bcd8ac3b 100755 --- a/sysconfig/network-scripts/ifup-routes +++ b/sysconfig/network-scripts/ifup-routes @@ -7,18 +7,11 @@ if [ "$1" = "" ]; then exit 1 fi -# don't run linuxconf if /usr isn't there -#if [ -x /bin/linuxconf -a -f /usr/lib/libncurses.so.4.2 ] ; then -# linuxconf --hint routing "$1" | while read args; do -# /sbin/route $args -# done -#else - if [ ! -f /etc/sysconfig/static-routes ]; then - exit 0 - fi +if [ ! -f /etc/sysconfig/static-routes ]; then + exit 0 +fi - #note the trailing space in the grep gets rid of aliases - grep "^$1 " /etc/sysconfig/static-routes | while read device args; do - /sbin/route add -$args $device - done -#fi +#note the trailing space in the grep gets rid of aliases +grep "^$1 " /etc/sysconfig/static-routes | while read device args; do + /sbin/route add -$args $device +done |