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

[Petter Reinholdtsen]

Author: pere
Date: 2006-10-06 17:37:02 +0000 (Fri, 06 Oct 2006)
New Revision: 1014

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/postinst
Log:
  * Do not fail to install initscripts even if /lib/init/rw/ can
    not be mounted. (Closes: #391115)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-10-06 17:31:15 UTC (rev 1013)
+++ sysvinit/trunk/debian/changelog	2006-10-06 17:37:02 UTC (rev 1014)
@@ -4,6 +4,8 @@
     umount it either.  Avoids confusing users. (Closes: #391122)
   * Let initscripts conflict with udev << 0.080-1, and stop calling
     mountdevsub.sh from mtab.sh. (Closes: #391312)
+  * Do not fail to install initscripts even if /lib/init/rw/ can
+    not be mounted. (Closes: #391115)
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri,  6 Oct 2006 17:21:27 +0200
 

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2006-10-06 17:31:15 UTC (rev 1013)
+++ sysvinit/trunk/debian/initscripts/postinst	2006-10-06 17:37:02 UTC (rev 1014)
@@ -191,14 +191,16 @@
 # system do not support tmpfs
 #
 if dpkg --compare-versions "$PREV_VER" lt "2.86.ds1-27" \
-   && grep -E -qs "tmpfs\$" /proc/filesystems \
    && [ ! -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"
-	mount -t tmpfs tmpfs /lib/init/rw -omode=0755,nosuid$RW_OPT
-	touch /lib/init/rw/.ramfs
+	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
 fi
 
 #