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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-29 16:05:44 +0000 (Fri, 29 Sep 2006)
New Revision: 985

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
Log:
  * Drop the 'noexec' flag from the /dev/shm/ mount point until etch
    is released, to avoid breaking dosemu and user-mode-linux.  After
    etch is released, packages should use a different tmpfs area.
    This is related bugs #386945 and #386368.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-29 13:14:42 UTC (rev 984)
+++ sysvinit/trunk/debian/changelog	2006-09-29 16:05:44 UTC (rev 985)
@@ -4,6 +4,10 @@
     environment. (Closes: #390126)
   * Update init.d/mtab.sh to make sure it store the options used to mount
     /dev/shm in /etc/mtab.
+  * Drop the 'noexec' flag from the /dev/shm/ mount point until etch
+    is released, to avoid breaking dosemu and user-mode-linux.  After
+    etch is released, packages should use a different tmpfs area.
+    This is related bugs #386945 and #386368.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 29 Sep 2006 14:36:32 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh	2006-09-29 13:14:42 UTC (rev 984)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh	2006-09-29 16:05:44 UTC (rev 985)
@@ -33,7 +33,7 @@
 	#
 	SHM_OPT=
 	[ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT=",size=$SHM_SIZE"
-	domount tmpfs shmfs /dev/shm tmpfs -onoexec,nosuid,nodev$SHM_OPT
+	domount tmpfs shmfs /dev/shm tmpfs -onosuid,nodev$SHM_OPT
 
 	#
 	# Mount /dev/pts. Create master ptmx node if needed.

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