[Pkg-sysvinit-commits] r833 - in sysvinit/trunk/debian: . sysv-rc/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-05 14:46:39 +0000 (Tue, 05 Sep 2006)
New Revision: 833

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
  * Remove obsolete code in init.d/rc to execute /sbin/unconfigured.sh
    and /sbin/setup.sh.  It was only to be used during installation,
    and the installer no longer need it.  Add a init.d script if you
    need the functionallity.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-05 14:37:01 UTC (rev 832)
+++ sysvinit/trunk/debian/changelog	2006-09-05 14:46:39 UTC (rev 833)
@@ -30,6 +30,10 @@
   * Mount netdev file systems when the network interfaces are enabled.
     (Closes: #383123)
   * Umount netdev file systems in umountnfs.sh. (Closes: #383124)
+  * Remove obsolete code in init.d/rc to execute /sbin/unconfigured.sh
+    and /sbin/setup.sh.  It was only to be used during installation,
+    and the installer no longer need it.  Add a init.d script if you
+    need the functionallity.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 26 Jul 2006 11:37:23 +0200
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2006-09-05 14:37:01 UTC (rev 832)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2006-09-05 14:46:39 UTC (rev 833)
@@ -62,18 +62,6 @@
 
 export runlevel previous
 
-if [ S = "$runlevel" ]
-then
-	#
-	# See if system needs to be setup. This is ONLY meant to
-	# be used for the initial setup after a fresh installation!
-	#
-	if [ -x /sbin/unconfigured.sh ]
-	then
-		/sbin/unconfigured.sh
-	fi
-fi
-
 . /etc/default/rcS
 export VERBOSE
 
@@ -329,15 +317,6 @@
 	# For compatibility, run the files in /etc/rc.boot too.
 	#
 	[ -d /etc/rc.boot ] && run-parts /etc/rc.boot
-
-	#
-	# Finish setup if needed. The comment above about
-	# /sbin/unconfigured.sh applies here as well!
-	#
-	if [ -x /sbin/setup.sh ]
-	then
-		/sbin/setup.sh
-	fi
 fi
 
 trap - EXIT # Disable emergency handler