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

[Petter Reinholdtsen]

Author: pere
Date: 2006-10-19 08:15:42 +0000 (Thu, 19 Oct 2006)
New Revision: 1018

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/postinst
Log:
  * Remove the postinst code in initscripts to mouve /lib/init/rw/.
    Just require a reboot for it to take effect, instead of trying to
    make sure it is mounted when the package is installed.  Flag this
    need using /usr/share/update-notifier/notify-reboot-required if it
    exist.  (Closes: #393465, #391605, #390126)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-10-06 17:54:34 UTC (rev 1017)
+++ sysvinit/trunk/debian/changelog	2006-10-19 08:15:42 UTC (rev 1018)
@@ -1,3 +1,13 @@
+sysvinit (2.86.ds1-34~1) unstable; urgency=low
+
+  * Remove the postinst code in initscripts to mouve /lib/init/rw/.
+    Just require a reboot for it to take effect, instead of trying to
+    make sure it is mounted when the package is installed.  Flag this
+    need using /usr/share/update-notifier/notify-reboot-required if it
+    exist.  (Closes: #393465, #391605, #390126)
+
+ -- Petter Reinholdtsen <pere at debian.org>  Thu, 19 Oct 2006 10:05:50 +0200
+
 sysvinit (2.86.ds1-33) unstable; urgency=low
 
   * Do not insert /dev/.static/dev in /etc/mtab, and do not try to

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2006-10-06 17:54:34 UTC (rev 1017)
+++ sysvinit/trunk/debian/initscripts/postinst	2006-10-19 08:15:42 UTC (rev 1018)
@@ -186,21 +186,14 @@
 fi
 
 #
-# Make sure packages needing a writable tmpfs available can depend on
-# initscripts version 2.86.ds1-27 or newer to get it.  Skip it if the
-# system do not support tmpfs
+# When installing for the first time or upgrading from version before 2.86.ds1-27,
+# a reboot is needed to make the /lib/init/rw/ tmpfs available.  Flag this
+# using notify-reboot-required.  Not mounting it here as it creates problem
+# for debootstrap, vservers, pbuilder and cowbuilder.
 #
 if dpkg --compare-versions "$PREV_VER" lt "2.86.ds1-27" \
-   && [ ! -f /lib/init/rw/.ramfs ] && ! chrooted ; then
-	[ -f /etc/default/tmpfs ] && . /etc/default/tmpfs
-
-	RW_OPT=
-	[ "${RW_SIZE:=$TMPFS_SIZE}" ] && RW_OPT=",size=$RW_SIZE"
-	if mount -t tmpfs tmpfs /lib/init/rw -omode=0755,nosuid$RW_OPT ; then
-		touch /lib/init/rw/.ramfs
-	else
-		echo "This system seem to miss tmpfs support.  Not mounting /lib/init/rw/."
-	fi
+ && [ -x /usr/share/update-notifier/notify-reboot-required ]; then
+	/usr/share/update-notifier/notify-reboot-required
 fi
 
 #