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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-12 00:37:46 +0000 (Thu, 12 Jan 2006)
New Revision: 618

Added:
   sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/conffiles
   sysvinit/trunk/debian/initscripts/postinst
Log:
Add mtab.sh initscript to update mtab file after mountall.sh runs; replaces second mountvirtfs instance and still does exactly the same as mountvirtfs under the hood

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-12 00:35:36 UTC (rev 617)
+++ sysvinit/trunk/debian/changelog	2006-01-12 00:37:46 UTC (rev 618)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-10~12) experimental; urgency=low 
+sysvinit (2.86.ds1-10~13) experimental; urgency=low 
 
   [ Thomas Hood ]
   * rcS(5): Reword
@@ -13,9 +13,10 @@
   * Complete the split of mountdevsubfs out of mountvirtfs
   * /etc/init.d/README: Note that /etc/init.d/*.sh must have '#!/bin/sh'
     and must follow policy 10.4.
-  * mountvirtfs is now mountkernfs.sh
-    mountdevsubfs is now mountdevsubfs.sh
-    mountvirtfs now calls the above two (for backward compatibility)
+  * mountvirtfs -> mountkernfs.sh; mountdevsubfs -> mountdevsubfs.sh;
+    mountvirtfs now calls the above two (for backward compatibility);
+    mtab.sh now runs mountkernfs.sh and mountdevsubfs.sh to update
+    the mtab file after mountall.sh.
   * /etc/init.d/rc: Restore PATH after sourcing an initscript
   * Make more messages depend on VERBOSE being != no
 

Modified: sysvinit/trunk/debian/initscripts/conffiles
===================================================================
--- sysvinit/trunk/debian/initscripts/conffiles	2006-01-12 00:35:36 UTC (rev 617)
+++ sysvinit/trunk/debian/initscripts/conffiles	2006-01-12 00:37:46 UTC (rev 618)
@@ -12,9 +12,10 @@
 /etc/init.d/mountall-bootclean.sh
 /etc/init.d/mountnfs.sh
 /etc/init.d/mountnfs-bootclean.sh
+/etc/init.d/mountdevsubfs.sh
+/etc/init.d/mountkernfs.sh
 /etc/init.d/mountvirtfs
-/etc/init.d/mountkernfs.sh
-/etc/init.d/mountdevsubfs.sh
+/etc/init.d/mtab.sh
 /etc/init.d/reboot
 /etc/init.d/rmnologin
 /etc/init.d/sendsigs

Added: sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh	2006-01-12 00:35:36 UTC (rev 617)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh	2006-01-12 00:37:46 UTC (rev 618)
@@ -0,0 +1,33 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          mtab
+# Required-Start:    mountall
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Update mtab file.
+# Description:       Update mtab file after
+#                    all local filesystems have been mounted
+### END INIT INFO
+
+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: mountall-mtab.sh [start|stop]" >&2
+	exit 3
+	;;
+esac
+
+:


Property changes on: sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2006-01-12 00:35:36 UTC (rev 617)
+++ sysvinit/trunk/debian/initscripts/postinst	2006-01-12 00:37:46 UTC (rev 618)
@@ -102,8 +102,8 @@
 #
 # Links in runlevel S
 #
-updatercd mountkernfs.sh         start 2 S . start 36 S .
-updatercd mountdevsubfs.sh       start 4 S . start 37 S .
+updatercd mountkernfs.sh         start 2 S .
+updatercd mountdevsubfs.sh       start 4 S .
 updatercd bootlogd               start 5 S .
 updatercd checkroot.sh           start 10 S .
 # The modutils postinst doesn't do this so we do:
@@ -111,6 +111,7 @@
 updatercd checkfs.sh             start 30 S .
 updatercd mountall.sh            start 35 S .
 updatercd mountall-bootclean.sh  start 36 S .
+updatercd mtab.sh                start 36 S .
 updatercd hostname.sh            start 40 S .
 updatercd mountnfs.sh            start 45 S .
 updatercd mountnfs-bootclean.sh  start 46 S .