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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-30 15:06:59 +0000 (Sat, 30 Sep 2006)
New Revision: 993

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/postinst
Log:
  * Do not try to create /var/run and /var/lock during installation or
    upgrades if /var is a relative symlink.  It is not going to work.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-30 14:26:37 UTC (rev 992)
+++ sysvinit/trunk/debian/changelog	2006-09-30 15:06:59 UTC (rev 993)
@@ -6,6 +6,8 @@
   * Only try to create /var/run and /var/lock on the root file system
     in non-chroot environments?
   * Use 'mkdir -p' when creating /.root, to avoid failing if it already exist.
+  * Do not try to create /var/run and /var/lock during installation or
+    upgrades if /var is a relative symlink.  It is not going to work.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 30 Sep 2006 14:37:36 +0200
 

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2006-09-30 14:26:37 UTC (rev 992)
+++ sysvinit/trunk/debian/initscripts/postinst	2006-09-30 15:06:59 UTC (rev 993)
@@ -173,7 +173,13 @@
 	# just in case /var is a mountpoint or a symlink to one.
 	mkdir -p /.root
 	if mount -n --bind / /.root ; then
-		mkdir -p /.root/var/run /.root/var/lock
+		if [ -L /.root/var ] && [ ! -d /.root/var ] ; then
+			# No use trying if /var is a relative symlink.  It is not
+			# going to work.
+			:
+		else
+			mkdir -p /.root/var/run /.root/var/lock
+		fi
 		umount /.root
 	fi
 	rmdir /.root