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

[Kel Modderman]

Author: kelmo-guest
Date: 2011-05-15 01:32:08 +0000 (Sun, 15 May 2011)
New Revision: 1962

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts.postinst
   sysvinit/trunk/debian/src/initscripts/etc/init.d/mtab.sh
   sysvinit/trunk/debian/src/initscripts/lib/init/mount-functions.sh
Log:
Apply NMU for sysvinit (2.88dsf-13.6).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2011-04-29 13:28:13 UTC (rev 1961)
+++ sysvinit/trunk/debian/changelog	2011-05-15 01:32:08 UTC (rev 1962)
@@ -1,3 +1,18 @@
+sysvinit (2.88dsf-13.6) unstable; urgency=low
+
+  [ Roger Leigh ]
+  * Non-maintainer upload.
+  * Don't remount filesystems mounted in the initramfs until mtab
+    exists.  Use the existing reload functionality of mountkernfs
+    an mountdevsubfs to allow mtab.sh to trigger the remounts.
+    (Closes: #623174)
+  * Revert to using absolute paths in compatibility symlinks in order
+    to comply with Policy §10.5 symlink rules. (Closes: #626263)
+  * The permissions of /tmp are only set when root is writable.
+    (Closes: #623934)
+
+ -- Roger Leigh <rleigh at debian.org>  Sat, 14 May 2011 00:30:52 +0100
+
 sysvinit (2.88dsf-13.5) experimental; urgency=low
 
   [ Roger Leigh ]

Modified: sysvinit/trunk/debian/initscripts.postinst
===================================================================
--- sysvinit/trunk/debian/initscripts.postinst	2011-04-29 13:28:13 UTC (rev 1961)
+++ sysvinit/trunk/debian/initscripts.postinst	2011-05-15 01:32:08 UTC (rev 1962)
@@ -244,14 +244,14 @@
 if guest_environment; then
 	# Symlink /var/run from /run
         # Note var/run is relative
-	if compat_link var/run /run; then
+	if compat_link /var/run /run; then
 		# Symlink /var/lock from /run/lock
 		# Note that it's really /var/run/lock
-		compat_link ../../var/lock /run/lock
+		compat_link /var/lock /run/lock
 
 		# Symlink /dev/shm from /run/shm
 		# Note that it's really /var/run/shm
-		compat_link ../../dev/shm /run/shm
+		compat_link /dev/shm /run/shm
 	fi
 # Host system, not a chroot.
 else

Modified: sysvinit/trunk/debian/src/initscripts/etc/init.d/mtab.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/init.d/mtab.sh	2011-04-29 13:28:13 UTC (rev 1961)
+++ sysvinit/trunk/debian/src/initscripts/etc/init.d/mtab.sh	2011-05-15 01:32:08 UTC (rev 1962)
@@ -77,10 +77,12 @@
 	# Add entries for mounts created in early boot
 	# S01mountkernfs.sh
 	/etc/init.d/mountkernfs.sh mtab
+	/etc/init.d/mountkernfs.sh reload
 	# S03udev
 	domount mtab tmpfs "" /dev "udev" "-omode=0755"
 	# S03mountdevsubfs.sh
 	/etc/init.d/mountdevsubfs.sh mtab
+	/etc/init.d/mountdevsubfs.sh reload
 
 	# Add everything else in /proc/mounts into /etc/mtab, with
 	# special exceptions.

Modified: sysvinit/trunk/debian/src/initscripts/lib/init/mount-functions.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/lib/init/mount-functions.sh	2011-04-29 13:28:13 UTC (rev 1961)
+++ sysvinit/trunk/debian/src/initscripts/lib/init/mount-functions.sh	2011-05-15 01:32:08 UTC (rev 1962)
@@ -87,11 +87,9 @@
 	found=1
 
 	if [ -f /etc/fstab ]; then
-
 		exec 9<&0 </etc/fstab
 
-
-		while read MNT_FSNAME MNT_DIR MNT_TYPE MNT_OPTS MNT_FREQ MAN_PASS MAN_JUNK
+		while read MNT_FSNAME MNT_DIR MNT_TYPE MNT_OPTS MNT_FREQ MNT_PASS MNT_JUNK
 		do
 			case "$MNT_FSNAME" in
 				""|\#*)
@@ -109,9 +107,9 @@
 		done
 
 		exec 0<&9 9<&-
-
-		return $found
 	fi
+
+	return $found
 }
 
 # Mount kernel and device file systems.
@@ -210,8 +208,8 @@
 			if mountpoint -q "$MTPT"; then
 			    # Already mounted, probably moved from the
 			    # initramfs, so remount with the
-			    # user-specified mount options.
-			    mount $MOUNTFLAGS -oremount $CALLER_OPTS $FSTAB_OPTS $MTPT
+			    # user-specified mount options later on.
+			    :
 			else
 				if [ "$VERBOSE" != "no" ]; then
 					is_empty_dir "$MTPT" >/dev/null 2>&1 || log_warning_msg "Files under mount point '$MTPT' will be hidden."
@@ -279,7 +277,6 @@
 {
 	OLD=$1
 	RUN=$2
-	RUNLINK=$3
 
 	KERNEL="$(uname -s)"
 	OPTS=""
@@ -290,11 +287,13 @@
 		*)         FSTYPE=none ;;
 	esac
 
-	# Create relative symlink if not already present.  This is to
-	# upgrade from older versions which created absolute links.
-	if [ -L "$OLD" ] && [ "$(readlink "$OLD")" = "$RUN" ]; then
+	# Create absolute symlink if not already present.  This is to
+	# upgrade from older versions which created relative links,
+	# which are not permitted in policy between top-level
+	# directories.
+	if [ -L "$OLD" ] && [ "$(readlink "$OLD")" != "$RUN" ]; then
 		rm -f "$OLD"
-		ln -fs "$RUNLINK" "$OLD"
+		ln -fs "$RUN" "$OLD"
 	fi
 
 	# If both directories are the same, we don't need to do
@@ -323,11 +322,11 @@
 		mount -t $FSTYPE "$RUN" "$OLD" $OPTS
 	else
 		# Create symlink if not already present.
-		if [ -L "$OLD" ] && [ "$(readlink "$OLD")" = "$RUNLINK" ]; then
+		if [ -L "$OLD" ] && [ "$(readlink "$OLD")" != "$RUN" ]; then
 			:
 		else
 			rm -f "$OLD"
-			ln -fs "$RUNLINK" "$OLD"
+			ln -fs "$RUN" "$OLD"
 		fi
 	fi
 
@@ -351,7 +350,7 @@
 	# filesystems are mounted, we replace the directory with a
 	# symlink where possible.
 
-	run_migrate /var/run /run ../run
-	run_migrate /var/lock /run/lock ../run/lock
-	run_migrate /dev/shm /run/shm ../run/shm
+	run_migrate /var/run /run
+	run_migrate /var/lock /run/lock
+	run_migrate /dev/shm /run/shm
 }