[Pkg-sysvinit-commits] r838 - in sysvinit/trunk/debian: . initscripts/etc/init.d initscripts/etc/network/if-up.d initscripts/lib/init

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-05 22:36:59 +0000 (Tue, 05 Sep 2006)
New Revision: 838

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
   sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs
   sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh
Log:
  * Add empty functions pre_mountall and post_mountall to reduce the
    difference between the Ubuntu version

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-05 22:30:04 UTC (rev 837)
+++ sysvinit/trunk/debian/changelog	2006-09-05 22:36:59 UTC (rev 838)
@@ -40,6 +40,8 @@
     /etc/mtab with info on all file systems mounted before /etc/mtab
     was writable by processing /proc/mounts.  Based on patch from
     Scott James Remnant and Ubuntu.
+  * Add empty functions pre_mountall and post_mountall to reduce the
+    difference between the Ubuntu version
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 26 Jul 2006 11:37:23 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2006-09-05 22:30:04 UTC (rev 837)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2006-09-05 22:36:59 UTC (rev 838)
@@ -15,6 +15,7 @@
 . /lib/init/vars.sh
 
 . /lib/lsb/init-functions
+. /lib/init/mount-functions.sh
 
 do_start() {
 	#
@@ -24,6 +25,7 @@
 	    mount -a -t noproc,nfs,nfs4,smbfs,cifs,ncp,ncpfs,coda,ocfs2,gfs \
 		-O no_netdev
 	}
+	pre_mountall
 	if [ "$VERBOSE" = no ]
 	then
 		log_action_begin_msg "Mounting local filesystems"
@@ -52,6 +54,7 @@
 			log_failure_msg "Mounting local filesystems failed with error code ${ES}."
 		fi
 	fi
+	post_mountall
 
 	case "$(uname -s)" in
 	  *FreeBSD)

Modified: sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs	2006-09-05 22:30:04 UTC (rev 837)
+++ sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs	2006-09-05 22:36:59 UTC (rev 838)
@@ -11,6 +11,7 @@
 . /lib/init/vars.sh
 
 . /lib/lsb/init-functions
+. /lib/init/mount-functions.sh
 
 do_start() {
 	[ -f /etc/fstab ] || return
@@ -113,6 +114,7 @@
 		/etc/init.d/nfs-common start
 	fi
 
+	pre_mountall
 	if [ "$NETFS" ]
 	then
 		mount -a -t$NETFS
@@ -120,6 +122,7 @@
 	if [ "$NETDEV" ]; then
 		mount -a -O _netdev
 	fi
+	post_mountall
 }
 
 

Modified: sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh	2006-09-05 22:30:04 UTC (rev 837)
+++ sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh	2006-09-05 22:36:59 UTC (rev 838)
@@ -104,3 +104,13 @@
 	fi
 	mount -n -t $FSTYPE $OPTS $4 $FSTYPE $MTPT
 }
+
+pre_mountall ()
+{
+	:
+}
+
+post_mountall ()
+{
+	:
+}