diff options
| author | Bill Nottingham <notting@redhat.com> | 1999-06-17 16:41:53 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 1999-06-17 16:41:53 +0000 |
| commit | 1e3d46fdd8ce527a96007ba592b52038fb56bdbe (patch) | |
| tree | 26d81259acdb86717d6162aa04de3969a5c4eb0a | |
| parent | 31009d281f37bd6333cad638ba87357ad7bc069a (diff) | |
| download | initscripts-1e3d46fdd8ce527a96007ba592b52038fb56bdbe.tar initscripts-1e3d46fdd8ce527a96007ba592b52038fb56bdbe.tar.gz initscripts-1e3d46fdd8ce527a96007ba592b52038fb56bdbe.tar.bz2 initscripts-1e3d46fdd8ce527a96007ba592b52038fb56bdbe.tar.xz initscripts-1e3d46fdd8ce527a96007ba592b52038fb56bdbe.zip | |
comment out linuxconf support
| -rwxr-xr-x | sysconfig/network-scripts/ifup-aliases | 61 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-routes | 12 |
2 files changed, 38 insertions, 35 deletions
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases index 7fbaf108..8353a751 100755 --- a/sysconfig/network-scripts/ifup-aliases +++ b/sysconfig/network-scripts/ifup-aliases @@ -9,34 +9,37 @@ if [ "$device" = "" ]; then fi # don't run linuxconf if /usr isn't there... -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 +# +# 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 @@ -47,4 +50,4 @@ else /etc/sysconfig/network-scripts/ifup $device:$current current=`expr $current + 1` done -fi +#fi diff --git a/sysconfig/network-scripts/ifup-routes b/sysconfig/network-scripts/ifup-routes index f16750d5..b623cfd9 100755 --- a/sysconfig/network-scripts/ifup-routes +++ b/sysconfig/network-scripts/ifup-routes @@ -8,11 +8,11 @@ if [ "$1" = "" ]; then 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 [ -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 @@ -21,4 +21,4 @@ else grep "^$1 " /etc/sysconfig/static-routes | while read device args; do /sbin/route add -$args $device done -fi +#fi |