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

[kelmo-guest at alioth.debian.org]

Author: kelmo-guest
Date: 2009-03-14 13:08:18 +0000 (Sat, 14 Mar 2009)
New Revision: 1328

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/postinst
Log:
Allow initscripts postinst maintainer script to not fail when
attempting to mkdir /dev/pts and /dev/shm when running in a
fakechroot environment. This is done by checking for FAKECHROOT env
variable before bailing out. Patch thanks to Daniel Kahn Gillmor.
(Closes: #504877)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-03-14 12:51:52 UTC (rev 1327)
+++ sysvinit/trunk/debian/changelog	2009-03-14 13:08:18 UTC (rev 1328)
@@ -51,8 +51,13 @@
     debian/sysv-rc/etc/init.d/rc never actually sourced scripts ending in .sh
     anyway, because they all too often called exit causing problems. Update
     to Standards version 3.8.1. (Closes: #339955, #519520)
+  * Allow initscripts postinst maintainer script to not fail when
+    attempting to mkdir /dev/pts and /dev/shm when running in a
+    fakechroot environment. This is done by checking for FAKECHROOT env
+    variable before bailing out. Patch thanks to Daniel Kahn Gillmor.
+    (Closes: #504877)
 
- -- Kel Modderman <kel at otaku42.de>  Sat, 14 Mar 2009 22:49:54 +1000
+ -- Kel Modderman <kel at otaku42.de>  Sat, 14 Mar 2009 23:06:36 +1000
 
 sysvinit (2.86.ds1-61) unstable; urgency=low
 

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2009-03-14 12:51:52 UTC (rev 1327)
+++ sysvinit/trunk/debian/initscripts/postinst	2009-03-14 13:08:18 UTC (rev 1328)
@@ -277,11 +277,12 @@
 	# root file system. If some package has mounted a
 	# seperate /dev (ramfs from udev, devfs) it is
 	# responsible for the presence of those subdirs.
+	# (it is OK for these to fail under fakechroot)
 	#
 	if ! mountpoint -q /dev
 	then
-		[ -d /dev/pts ] || { mkdir --mode=755 /dev/pts ; chown root:root /dev/pts ; }
-		[ -d /dev/shm ] || { mkdir --mode=755 /dev/shm ; chown root:root /dev/shm ; }
+		[ -d /dev/pts ] || { mkdir --mode=755 /dev/pts ; chown root:root /dev/pts || [ "$FAKECHROOT" = true ]; }
+		[ -d /dev/shm ] || { mkdir --mode=755 /dev/shm ; chown root:root /dev/shm || [ "$FAKECHROOT" = true ]; }
 	fi
 fi