[Pkg-sysvinit-commits] r989 - in sysvinit/trunk/debian: . initscripts

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-30 12:39:29 +0000 (Sat, 30 Sep 2006)
New Revision: 989

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/postinst
Log:
  * Ignore problems with creating /var/run and /var/lock during installation
    and upgrades.  This avoid installation problem in vserver environments.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-29 16:36:39 UTC (rev 988)
+++ sysvinit/trunk/debian/changelog	2006-09-30 12:39:29 UTC (rev 989)
@@ -1,3 +1,10 @@
+sysvinit (2.86.ds1-29~1) unstable; urgency=low
+
+  * Ignore problems with creating /var/run and /var/lock during installation
+    and upgrades.  This avoid installation problem in vserver environments.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sat, 30 Sep 2006 14:37:36 +0200
+
 sysvinit (2.86.ds1-28) unstable; urgency=low
 
   * Avoid mounting /lib/init/rw/ when being installed in a chroot

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2006-09-29 16:36:39 UTC (rev 988)
+++ sysvinit/trunk/debian/initscripts/postinst	2006-09-30 12:39:29 UTC (rev 989)
@@ -162,18 +162,20 @@
 
 #
 # Create /var/run and /var/lock on the root partition to make sure
-# they are available if RAMRUN or RAMLOCK is enabled.
+# they are available when RAMRUN or RAMLOCK is enabled.
+# If mount fail (like in a vserver environment), just clean up and ignore
+# it.  The admins enabling RAMRUN and RAMLOCK will have to create the
+# directories themselves in this case.
 #
 if dpkg --compare-versions "$PREV_VER" lt "2.86.ds1-22"
 then
 	# We need to quickly bind / to another location so we can make them
 	# just in case /var is a mountpoint or a symlink to one.
 	mkdir /.root
-	mount -n --bind / /.root
-
-	mkdir -p /.root/var/run /.root/var/lock
-
-	umount /.root
+	if mount -n --bind / /.root ; then
+		mkdir -p /.root/var/run /.root/var/lock
+		umount /.root
+	fi
 	rmdir /.root
 fi