[Pkg-sysvinit-commits] r670 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-17 18:41:58 +0000 (Tue, 17 Jan 2006)
New Revision: 670

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
Log:
Eliminate /sbin/update code

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-17 18:30:42 UTC (rev 669)
+++ sysvinit/trunk/debian/changelog	2006-01-17 18:41:58 UTC (rev 670)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-11~5) unstable; urgency=low
+sysvinit (2.86.ds1-11~6) unstable; urgency=low
 
   [ Petter Reinholdtsen ]
   * Upload to unstable  (Closes: #341075)
@@ -8,6 +8,8 @@
   * bootlogd(8): Improve; mention need for PTY support
   * initscripts preinst and postinst: Update
   * initscripts: Harmonize PATH settings
+  * checkroot.sh: Don't start /sbin/update.  We don't support pre-2.4
+    kernels any more.
   * Previous release also
     closes: #258290 "bootlogd: Bad file descriptor"
     closes: #327865 "bootlogd stopped working"

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-01-17 18:30:42 UTC (rev 669)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-01-17 18:41:58 UTC (rev 670)
@@ -31,20 +31,6 @@
 	MACHINE="$(uname -m)"
 
 	#
-	# Ensure that bdflush (update) is running before any major I/O is
-	# performed (the following fsck is a good example of such activity :).
-	# Only needed for kernels < 2.4.
-	#
-	if [ -x /sbin/update ] && [ "$KERNEL" = Linux ]
-	then
-		case "$RELEASE" in
-			0.*|1.*|2.[0123].*)
-				/sbin/update
-			;;
-		esac
-	fi
-
-	#
 	# Read /etc/fstab, looking for:
 	# 1) The root filesystem, resolving LABEL=*|UUID=* entries to the
 	# 	device node,