[Pkg-sysvinit-commits] r1963 - sysvinit/trunk/debian

[Kel Modderman]

Author: kelmo-guest
Date: 2011-05-16 10:42:41 +0000 (Mon, 16 May 2011)
New Revision: 1963

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts.postinst
Log:
* Non-maintainer upload.
* Correct version check used for reboot notification in initscripts
  postinst.
* Don't use "rm -rf" when creating compatibility links in chroots;
  use plain rmdir and abort with an error if it fails.  This is in
  order to avoid removing host data if e.g. /run from the host is
  already bind mounted on the chroot /run, which would remove the
  contents of the host /run if upgrading initscripts in the chroot.
* Restore rpcbind/portmap changes from 2.88dsf-13.5.
  to comply with Policy ?\194?\16710.5 symlink rules. (Closes: #626263)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2011-05-15 01:32:08 UTC (rev 1962)
+++ sysvinit/trunk/debian/changelog	2011-05-16 10:42:41 UTC (rev 1963)
@@ -1,3 +1,18 @@
+sysvinit (2.88dsf-13.7) unstable; urgency=low
+
+  [ Roger Leigh ]
+  * Non-maintainer upload.
+  * Correct version check used for reboot notification in initscripts
+    postinst.
+  * Don't use "rm -rf" when creating compatibility links in chroots;
+    use plain rmdir and abort with an error if it fails.  This is in
+    order to avoid removing host data if e.g. /run from the host is
+    already bind mounted on the chroot /run, which would remove the
+    contents of the host /run if upgrading initscripts in the chroot.
+  * Restore rpcbind/portmap changes from 2.88dsf-13.5.
+
+ -- Roger Leigh <rleigh at debian.org>  Sun, 15 May 2011 10:01:37 +0100
+
 sysvinit (2.88dsf-13.6) unstable; urgency=low
 
   [ Roger Leigh ]
@@ -7,7 +22,7 @@
     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)
+    to comply with Policy §10.5 symlink rules. (Closes: #626263)
   * The permissions of /tmp are only set when root is writable.
     (Closes: #623934)
 

Modified: sysvinit/trunk/debian/initscripts.postinst
===================================================================
--- sysvinit/trunk/debian/initscripts.postinst	2011-05-15 01:32:08 UTC (rev 1962)
+++ sysvinit/trunk/debian/initscripts.postinst	2011-05-16 10:42:41 UTC (rev 1963)
@@ -94,9 +94,23 @@
 
 	if [ -n "$ssrc" ] && [ "$ssrc" != "$sdest" ]; then
 		echo "guest environment detected: Linking $DEST to $SRC"
-		( rm -fr $DEST &&
-		  ln -fs $SRC $DEST) ||
-		  { echo "Can't symlink $DEST to $SRC; please fix manually."; return 1; }
+		(
+			if [ -e $DEST ]; then
+				if [ -L $DEST ]; then
+					echo "$DEST is already a symlink; not replacing with link to $SRC"
+					exit 0
+				elif [ -d $DEST ]; then
+					rmdir $DEST || exit 1
+				else
+					echo "$DEST isn't a directory or a symlink"
+					exit 1
+				fi
+			fi
+			ln -fs $SRC $DEST
+		) || {
+			echo "Can't symlink $DEST to $SRC; please fix manually."
+			return 1
+		}
 	fi
 
 	return 0
@@ -272,7 +286,7 @@
 # available in some form before the reboot, so the need for a reboot
 # isn't particularly urgent.
 #
-if dpkg --compare-versions "$PREV_VER" le "2.88dsf-14" \
+if dpkg --compare-versions "$PREV_VER" le "2.88dsf-13.3" \
  && [ -x /usr/share/update-notifier/notify-reboot-required ]; then
 	/usr/share/update-notifier/notify-reboot-required
 fi