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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-19 19:46:38 +0000 (Mon, 19 Dec 2005)
New Revision: 407

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/default/tmpfs
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
Log:
Make 4MiB the factory default limit on the size of /run ; Mount /run and /dev/shm early

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-12-19 18:55:04 UTC (rev 406)
+++ sysvinit/trunk/debian/changelog	2005-12-19 19:46:38 UTC (rev 407)
@@ -10,6 +10,7 @@
   * Check for files under mountpoints more thoroughly
   * Don't fail to install on file-rc systems  (Closes: #343993)
   * mountvirtfs: Mount tmpfs's earlier; move long comment to README.Debian
+  * Make 4MiB the factory default limit on the size of /run
 
  -- Thomas Hood <jdthood at yahoo.co.uk>  Sun, 18 Dec 2005 00:00:58 +0100
 

Modified: sysvinit/trunk/debian/initscripts/etc/default/tmpfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/default/tmpfs	2005-12-19 18:55:04 UTC (rev 406)
+++ sysvinit/trunk/debian/initscripts/etc/default/tmpfs	2005-12-19 19:46:38 UTC (rev 407)
@@ -7,4 +7,4 @@
 # 4096 bytes.
 
 SHM_SIZE=
-RUN_SIZE=
+RUN_SIZE=4194304

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-12-19 18:55:04 UTC (rev 406)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-12-19 19:46:38 UTC (rev 407)
@@ -136,6 +136,32 @@
 
 do_start () {
 	#
+	# Mount /run
+	#
+	RUN_OPT=
+	if [ "$RUN_SIZE" ]
+	then
+		RUN_OPT="-osize=$RUN_SIZE"
+	elif [ "$TMPFS_SIZE" ]
+	then
+		RUN_OPT="-osize=$TMPFS_SIZE"
+	fi
+	domount tmpfs "" /run -omode=755 $RUN_OPT
+
+	#
+	# Mount /dev/shm
+	#
+	SHM_OPT=
+	if [ "$SHM_SIZE" ]
+	then
+		SHM_OPT="-osize=$SHM_SIZE"
+	elif [ "$TMPFS_SIZE" ]
+	then
+		SHM_OPT="-osize=$TMPFS_SIZE"
+	fi
+	domount tmpfs shmfs /dev/shm $SHM_OPT
+
+	#
 	# Initialize mtab
 	#
 	DO_MTAB=
@@ -164,32 +190,6 @@
 	fi
 
 	#
-	# Mount /run
-	#
-	RUN_OPT=
-	if [ "$RUN_SIZE" ]
-	then
-		RUN_OPT="-osize=$RUN_SIZE"
-	elif [ "$TMPFS_SIZE" ]
-	then
-		RUN_OPT="-osize=$TMPFS_SIZE"
-	fi
-	domount tmpfs "" /run -omode=755 $RUN_OPT
-
-	#
-	# Mount /dev/shm
-	#
-	SHM_OPT=
-	if [ "$SHM_SIZE" ]
-	then
-		SHM_OPT="-osize=$SHM_SIZE"
-	elif [ "$TMPFS_SIZE" ]
-	then
-		SHM_OPT="-osize=$TMPFS_SIZE"
-	fi
-	domount tmpfs shmfs /dev/shm $SHM_OPT
-
-	#
 	# Mount /proc
 	#
 	domount proc "" /proc