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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-29 13:14:42 +0000 (Fri, 29 Sep 2006)
New Revision: 984

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
Log:
  * Update init.d/mtab.sh to make sure it store the options used to mount
    /dev/shm in /etc/mtab.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-29 12:40:26 UTC (rev 983)
+++ sysvinit/trunk/debian/changelog	2006-09-29 13:14:42 UTC (rev 984)
@@ -2,6 +2,8 @@
 
   * Avoid mounting /lib/init/rw/ during installation in a chroot
     environment. (Closes: #390126)
+  * Update init.d/mtab.sh to make sure it store the options used to mount
+    /dev/shm in /etc/mtab.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 29 Sep 2006 14:36:32 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh	2006-09-29 12:40:26 UTC (rev 983)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh	2006-09-29 13:14:42 UTC (rev 984)
@@ -140,8 +140,8 @@
 
 	# S04mountdevsubfs
 	SHM_OPT=
-	[ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT="-osize=$SHM_SIZE"
-	domtab tmpfs /dev/shm tmpfs $SHM_OPT
+	[ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT=",size=$SHM_SIZE"
+	domtab tmpfs /dev/shm tmpfs -onoexec,nosuid,nodev$SHM_OPT
 	domtab devpts /dev/pts "devpts" -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE
 
 	# Add everything else in /proc/mounts into /etc/mtab, with