From c9e63689f7192bdb82a088c835783a9de1fe862c Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 21 Sep 2001 15:38:05 +0000
Subject: expunge more linuxconf support

---
 ChangeLog                              | 32 ++++++++++++++++++++++++++++++++
 rc.d/rc                                |  3 ---
 sysconfig/network-scripts/ifup-aliases | 31 +------------------------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4791c15d..d230fa5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2001-09-21  romanm  <romanm@redhat.com>
+
+	* po/sl.po: partially translated
+
+2001-09-19  Than Ngo  <than@redhat.com>
+
+	* ChangeLog, initscripts.spec, sysconfig/network-scripts/ifdown-ppp, sysconfig/network-scripts/ifup-ppp:
+	* don't show user name by DSL connection
+
+2001-09-14  Preston Brown  <pbrown@redhat.com>
+
+	* rc.d/init.d/network:
+	remove remnants of LinuxConf.  Don't use ifconfig, only /sbin/ip.  Use check_device_down from network-functions instead of re-implementation.
+
+	* prefdm:
+	slight prefdm cleanup (i.e. no AnotherLevel support).
+
+2001-09-14  Karsten Hopp  <karsten@redhat.com>
+
+	* initscripts-s390.patch:
+	patch didn't apply anymore, fix OCO path
+
+2001-09-09  Bill Nottingham  <notting@redhat.com>
+
+	* ChangeLog: fix name
+
+	* ChangeLog, initscripts.spec:
+	6.40-1
+
+	* rc.d/rc.sysinit:
+	don't run hwclock --adjust on a readonly filesystem
+
 * 2001-09-19	Than Ngo	<than@redhat.com>
 	* ChangeLog, initscripts.spec: 6.41-1
 
diff --git a/rc.d/rc b/rc.d/rc
index b8ead1d7..69b4cd87 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -36,9 +36,6 @@ export CONFIRM
 # Get first argument. Set new runlevel to this argument.
 [ -n "$argv1" ] && runlevel="$argv1"
 
-# Tell linuxconf what runlevel we are in
-[ -d /var/run ] && echo "/etc/rc$runlevel.d" > /var/run/runlevel.dir
-
 # Is there an rc directory for this new runlevel?
 if [ -d /etc/rc$runlevel.d ]; then
 	# First, run the KILL scripts.
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index 84d37200..40d27f7d 100755
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -291,38 +291,11 @@ function new_interface ()
 
 if [ "$BASH_VERSINFO" ]; then shopt -s nullglob; else allow_null_glob_expansion=foo; fi
 
-# Is there any linuxconf-style alias files.
-linuxconfstyle=0
 for FILE in ifcfg-${parent_device}:* ; do
-
        ini_env;
        . $FILE;
-       if [ -z "$DEVICE" ]; then
-          # it's a linuxconf file.
-	  # I don't think this script will handle both style correctly
-	  # though. Well, those who knows about the other style don't know
-	  # the other style and vice versa
-	  linuxconfstyle=1
-       else
-         new_interface;
-       fi
+       new_interface;
 done
-if [ "$linuxconfstyle" = "1" ] ; then
-	linuxconf --hint ipalias $device \
-		| while read command ali ip mask bcast
-	do
-		if [ "$command" = "del" ] ; then
-			/sbin/ifconfig $ali down
-			do_netreport=yes
-		elif [ "$command" = "add" ] ; then
-			/sbin/ifconfig $ali $ip netmask $mask broadcast $bcast
-			do_netreport=yes
-		else
-			echo Incomatible hinting: $command $rest >&2
-		fi
-	  done
-fi
-
 
 for FILE in ifcfg-${parent_device}-range* ; do
 
@@ -357,7 +330,6 @@ done
        #
        # Remove any devices that should not be around
        #
-if [ "$linuxconfstyle" = "0" ] ; then
 	for DEVNUM in $rdev_LIST ; do
 	       eval " rdev_mark=\$rdev_${DEVNUM}_mark ";
 	       if [ -z "$rdev_mark" ]; then
@@ -366,7 +338,6 @@ if [ "$linuxconfstyle" = "0" ] ; then
         	       do_netreport=yes
 	       fi
 	done
-fi
        #
        # Notify of new device creation
        #
-- 
cgit v1.2.1