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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-05 09:46:55 +0000 (Tue, 05 Sep 2006)
New Revision: 824

Removed:
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/conffiles
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/postinst
Log:
  * Drop and remove /etc/init.d/mountvirtfs.  It is obsolete.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-05 09:38:42 UTC (rev 823)
+++ sysvinit/trunk/debian/changelog	2006-09-05 09:46:55 UTC (rev 824)
@@ -20,6 +20,7 @@
     renaming it to waitnfs.sh.  (Closes: #360123
   * Add rc.local support to be more compatible with non-Debian
     distributions.  Patch from Fabio M. Di Nitto via Ubuntu.
+  * Drop and remove /etc/init.d/mountvirtfs.  It is obsolete.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 26 Jul 2006 11:37:23 +0200
 

Modified: sysvinit/trunk/debian/initscripts/conffiles
===================================================================
--- sysvinit/trunk/debian/initscripts/conffiles	2006-09-05 09:38:42 UTC (rev 823)
+++ sysvinit/trunk/debian/initscripts/conffiles	2006-09-05 09:46:55 UTC (rev 824)
@@ -14,7 +14,6 @@
 /etc/init.d/mountnfs-bootclean.sh
 /etc/init.d/mountdevsubfs.sh
 /etc/init.d/mountkernfs.sh
-/etc/init.d/mountvirtfs
 /etc/init.d/mtab.sh
 /etc/init.d/reboot
 /etc/init.d/rmnologin

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-09-05 09:38:42 UTC (rev 823)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-09-05 09:46:55 UTC (rev 824)
@@ -376,7 +376,6 @@
 		[ "$roottype" != none ] &&
 			mount -f -o $rootopts -t $roottype $fstabroot /
 		[ "$devfs" ] && mount -f $devfs
-		/etc/init.d/mountvirtfs start
 	fi
 
 	#

Deleted: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2006-09-05 09:38:42 UTC (rev 823)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2006-09-05 09:46:55 UTC (rev 824)
@@ -1,31 +0,0 @@
-#! /bin/sh
-#
-# mountvirtfs
-#
-# Obsolete, but still provided for backward-compatibility
-#
-# Do not run this script directly in runlevel S. 
-# Run mountkernfs.sh and mountdevsubfs.sh instead.
-#
-
-case "$1" in
-  start|"")
-	set "start"
-	. /etc/init.d/mountkernfs.sh
-	set "start"
-	. /etc/init.d/mountdevsubfs.sh
-	;;
-  restart|reload|force-reload)
-	echo "Error: argument '$1' not supported" >&2
-	exit 3
-	;;
-  stop)
-	# No-op
-	;;
-  *)
-	echo "Usage: mountvirtfs [start|stop]" >&2
-	exit 3
-	;;
-esac
-
-:

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2006-09-05 09:38:42 UTC (rev 823)
+++ sysvinit/trunk/debian/initscripts/postinst	2006-09-05 09:46:55 UTC (rev 824)
@@ -127,20 +127,18 @@
 # Remove scripts that were left behind by older glibc (<< 2.3.2.ds1-12)
 # versions. We have the same functionality in mount{kern,devsub}fs.sh 
 #
-for F in mountkernfs devpts.sh
+#
+# In 2.86.ds1-10 the "mountvirtfs" script was replaced by
+# mountkernfs.sh and mountdevsubfs.sh.  It was removed completely in
+# 2.86.ds1-16.
+#
+for F in mountkernfs devpts.sh mountvirtfs
 do
 	rm -f /etc/init.d/$F
 	update-rc.d $F remove >/dev/null 2>&1 || :
 done
 
 #
-# In 2.86.ds1-10 the "mountvirtfs" script was replaced by
-# mountkernfs.sh and mountdevsubfs.sh.  For now the
-# /etc/init.d/mountvirtfs script is still included, though.
-#
-update-rc.d -f mountvirtfs remove >/dev/null 2>&1 || :
-
-#
 # Create initial log files
 #
 [ "$PREV_VER" ] || chmod 755 /var/log/fsck || :