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

[Kel Modderman]

Author: kelmo-guest
Date: 2011-04-16 20:46:02 +0000 (Sat, 16 Apr 2011)
New Revision: 1959

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/initscripts/etc/init.d/mountdevsubfs.sh
   sysvinit/trunk/debian/src/initscripts/etc/init.d/mountkernfs.sh
Log:
Apply final NMU difference for 2.88dsf-13.4.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2011-04-16 11:01:01 UTC (rev 1958)
+++ sysvinit/trunk/debian/changelog	2011-04-16 20:46:02 UTC (rev 1959)
@@ -1,3 +1,18 @@
+sysvinit (2.88dsf-13.4) experimental; urgency=low
+
+  [ Roger Leigh ]
+  * Non-maintainer upload.
+
+  [ Kel Modderman ]
+  * Remove code from /etc/init.d/bootmisc.sh which is not needed with modern
+    kernel which do not support BSD ptys. The udev check is not reliable
+    anymore due to /run/. Thanks Marco d'Itri (Closes: #620784)
+  * Handle user interupt of fsck in etc/init.d/checkfs.sh and
+    init.d/checkroot.sh. Trap SIGINT and handle fsck exit status of 32.
+    (Closes: #608534)
+
+ -- Roger Leigh <rleigh at debian.org>  Sat, 16 Apr 2011 16:50:51 +0100
+
 sysvinit (2.88dsf-13.3) experimental; urgency=low
 
   [ Roger Leigh ]
@@ -119,16 +134,8 @@
     Hurd does not currently support tmpfs mounts, but will do in the
     future.  Use firmlinks in place of bind mounts.
 
-  [ Kel Modderman ]
-  * Remove code from /etc/init.d/bootmisc.sh which is not needed with modern
-    kernel which do not support BSD ptys. The udev check is not reliable
-    anymore due to /run/. Thanks Marco d'Itri (Closes: #620784)
-  * Handle user interupt of fsck in etc/init.d/checkfs.sh and
-    init.d/checkroot.sh. Trap SIGINT and handle fsck exit status of 32.
-    (Closes: #608534)
+ -- Roger Leigh <rleigh at debian.org>  Sat, 16 Apr 2011 01:17:29 +0100
 
- -- Kel Modderman <kel at otaku42.de>  Sat, 16 Apr 2011 20:59:44 +1000
-
 sysvinit (2.88dsf-13.2) unstable; urgency=low
 
   * Non-maintainer upload.

Modified: sysvinit/trunk/debian/src/initscripts/etc/init.d/mountdevsubfs.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/init.d/mountdevsubfs.sh	2011-04-16 11:01:01 UTC (rev 1958)
+++ sysvinit/trunk/debian/src/initscripts/etc/init.d/mountdevsubfs.sh	2011-04-16 20:46:02 UTC (rev 1959)
@@ -38,13 +38,13 @@
 		[ -x /sbin/restorecon ] && /sbin/restorecon /run/shm
 	fi
 
+	SHM_OPT=
+	[ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT=",size=$SHM_SIZE"
+	[ "${SHM_MODE:=$TMPFS_MODE}" ] && SHM_OPT="$SHM_OPT,mode=$SHM_MODE"
 	if [ yes = "$RAMSHM" ] ; then
-		SHM_OPT=
-		[ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT=",size=$SHM_SIZE"
-		[ "${SHM_MODE:=$TMPFS_MODE}" ] && SHM_OPT="$SHM_OPT,mode=$SHM_MODE"
 		domount tmpfs shmfs /run/shm tmpfs "-onosuid,nodev$SHM_OPT"
 	else
-		chmod 1777 /run/shm
+		chmod "$SHM_MODE" /run/shm
 	fi
 
 	#

Modified: sysvinit/trunk/debian/src/initscripts/etc/init.d/mountkernfs.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/init.d/mountkernfs.sh	2011-04-16 11:01:01 UTC (rev 1958)
+++ sysvinit/trunk/debian/src/initscripts/etc/init.d/mountkernfs.sh	2011-04-16 20:46:02 UTC (rev 1959)
@@ -44,13 +44,13 @@
 	# Mount /run/lock as tmpfs if enabled.  This prevents user DoS
 	# of /run by filling /run/lock at the expense of using an
 	# additional tmpfs.
+	LOCK_OPT=
+	[ "${LOCK_SIZE:=$TMPFS_SIZE}" ] && LOCK_OPT=",size=$LOCK_SIZE"
+	[ "${LOCK_MODE:=$TMPFS_MODE}" ] && LOCK_OPT="$LOCK_OPT,mode=$LOCK_MODE"
 	if [ yes = "$RAMLOCK" ] ; then
-		LOCK_OPT=
-		[ "${LOCK_SIZE:=$TMPFS_SIZE}" ] && LOCK_OPT=",size=$LOCK_SIZE"
-		[ "${LOCK_MODE:=$TMPFS_MODE}" ] && LOCK_OPT="$LOCK_OPT,mode=$LOCK_MODE"
 		domount tmpfs shmfs /run/lock tmpfs "-onodev,noexec,nosuid$LOCK_OPT"
 	else
-		chmod 1777 /run/lock
+		chmod "$LOCK_MODE" /run/lock
 	fi
 
 	touch /run/lock/.ramfs
@@ -72,13 +72,15 @@
 	fi
 
 	# Mount /tmp as tmpfs if enabled.
+	TMP_OPT=
+	[ "${TMP_SIZE:=$TMPFS_SIZE}" ] && TMP_OPT=",size=$TMP_SIZE"
+	[ "${TMP_MODE:=$TMPFS_MODE}" ] && TMP_OPT="$TMP_OPT,mode=$TMP_MODE"
 	if [ yes = "$RAMTMP" ] ; then
-		TMP_OPT=
-		[ "${TMP_SIZE:=$TMPFS_SIZE}" ] && TMP_OPT=",size=$TMP_SIZE"
-		[ "${TMP_MODE:=$TMPFS_MODE}" ] && TMP_OPT="$TMP_OPT,mode=$TMP_MODE"
 		domount tmpfs shmfs /tmp tmpfs "-onodev,nosuid$TMP_OPT"
 	else
-		chmod 1777 /tmp
+		if [ rw = "$rootmode" ]; then
+			chmod "$TMP_MODE" /tmp
+		fi
 	fi
 
 	# Make pidfile omit directory for sendsigs