[Pkg-sysvinit-commits] r946 - sysvinit/trunk/debian/initscripts/lib/init

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-20 11:29:55 +0000 (Wed, 20 Sep 2006)
New Revision: 946

Modified:
   sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh
Log:
Use new /lib/init/rw/ when protecting /var/run/ and /var/lock/.

Modified: sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh	2006-09-20 11:29:25 UTC (rev 945)
+++ sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh	2006-09-20 11:29:55 UTC (rev 946)
@@ -123,12 +123,12 @@
 	# copies of the /var/run and /var/lock mounts elsewhere on the root
 	# filesystem so they can be moved back.
 	if [ yes = "$TMPRUN" ] ; then
-		mkdir /dev/shm/var.run
-		mount -n --bind /var/run /dev/shm/var.run
+		mkdir /lib/init/rw/var.run
+		mount -n --bind /var/run /lib/init/rw/var.run
 	fi
 	if [ yes = "$TMPLOCK" ] ; then
-		mkdir /dev/shm/var.lock
-		mount -n --bind /var/lock /dev/shm/var.lock
+		mkdir /lib/init/rw/var.lock
+		mount -n --bind /var/lock /lib/init/rw/var.lock
 	fi
 }
 
@@ -142,13 +142,13 @@
 	# do this regardless
 	if [ yes = "$TMPRUN" ] ; then
 		[ -d /var/run ] || mkdir /var/run
-		mount -n --move /dev/shm/var.run /var/run
-		rmdir /dev/shm/var.run
+		mount -n --move /lib/init/rw/var.run /var/run
+		rmdir /lib/init/rw/var.run
 	fi
 	if [ yes = "$TMPLOCK" ] ; then
 		[ -d /var/lock ] || mkdir /var/lock
-		mount -n --move /dev/shm/var.lock /var/lock
-		rmdir /dev/shm/var.lock
+		mount -n --move /lib/init/rw/var.lock /var/lock
+		rmdir /lib/init/rw/var.lock
 	fi
 	
 }