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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-29 12:40:26 +0000 (Fri, 29 Sep 2006)
New Revision: 983

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/postinst
Log:
  * Avoid mounting /lib/init/rw/ during installation in a chroot
    environment. (Closes: #390126)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-28 18:40:58 UTC (rev 982)
+++ sysvinit/trunk/debian/changelog	2006-09-29 12:40:26 UTC (rev 983)
@@ -1,3 +1,10 @@
+sysvinit (2.86.ds1-28~1) unstable; urgency=low
+
+  * Avoid mounting /lib/init/rw/ during installation in a chroot
+    environment. (Closes: #390126)
+
+ -- Petter Reinholdtsen <pere at debian.org>  Fri, 29 Sep 2006 14:36:32 +0200
+
 sysvinit (2.86.ds1-27) unstable; urgency=low
 
   * Make sure to mount /lib/init/rw/ during upgrades if it isn't mounted

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2006-09-28 18:40:58 UTC (rev 982)
+++ sysvinit/trunk/debian/initscripts/postinst	2006-09-29 12:40:26 UTC (rev 983)
@@ -69,6 +69,13 @@
 	done
 }
 
+chrooted() {
+  if [ -r /proc/1/root ]; then
+    return 1
+  fi
+  return 0
+}
+
 #
 # Initialize rcS default file.
 #
@@ -170,8 +177,12 @@
 	rmdir /.root
 fi
 
+#
+# Make sure packages needing a writable tmpfs available can depend on
+# initscripts version 2.86.ds1-27 or newer to get it.
+#
 if dpkg --compare-versions "$PREV_VER" lt "2.86.ds1-27" \
-   && [ ! -f /lib/init/rw/.ramfs ] ; then
+   && [ ! -f /lib/init/rw/.ramfs ] && ! chrooted ; then
 	[ -f /etc/default/tmpfs ] && . /etc/default/tmpfs
 
 	RW_OPT=