From: Victor Martinez <pitillo@ono.com>
Date: Wed, 28 Nov 2012 16:51:52 +0000 (+0000)
Subject: rc: aligned with upstream
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=8499ab6ed87ca1e1e13747105866027360509f65;p=crossrootfs.git

rc: aligned with upstream
---

diff --git a/rc/.md5sum b/rc/.md5sum
index ddfaef5..8a410a8 100644
--- a/rc/.md5sum
+++ b/rc/.md5sum
@@ -1,5 +1,5 @@
 d2a8e98a8b10ba09b2a9da34326b526a  inittab
-ef539e1a7680641ef76b38001eb86682  rc
+3858dfcab370c4e9b9d7356a1d3464a1  rc
 c8fe38143dffbbc628a7a33966fae408  rc.conf
 afe5cd67920474246ae74e54a9845339  rc.fix
 d1be35927946756c68242f29c16ee983  rc.local
diff --git a/rc/Pkgfile b/rc/Pkgfile
index e074cf2..e4098d8 100644
--- a/rc/Pkgfile
+++ b/rc/Pkgfile
@@ -5,7 +5,7 @@
 
 name=rc
 version=2.26
-release=1
+release=3
 source=(inittab rc rc.modules rc.single rc.multi rc.local rc.fix rc.shutdown rc.conf)
 
 build() {
diff --git a/rc/rc b/rc/rc
index 1ae73c2..4fc61d2 100644
--- a/rc/rc
+++ b/rc/rc
@@ -9,8 +9,8 @@ echo "The system is coming up.  Please wait."
 . /etc/rc.conf
 
 # Start udev
-/bin/mount -n -t proc none /proc
-/bin/mount -n -t sysfs none /sys
+/bin/mount -t proc none /proc
+/bin/mount -t sysfs none /sys
 /sbin/start_udev
 
 # Create device-mapper device nodes and scan for LVM volume groups
@@ -19,8 +19,13 @@ if [ -x /sbin/lvm ]; then
 	/sbin/vgchange --ignorelockingfailure -a y
 fi
 
+# Scan for btrfs volumes to simplify fstab entries
+if [ -r /sys/fs/btrfs ]; then
+	/sbin/btrfs dev scan
+fi
+
 # Mount root read-only
-/bin/mount -n -o remount,ro /
+/bin/mount -o remount,ro /
 
 if [ -f /forcefsck ]; then
 FORCEFSCK="-f"
@@ -43,16 +48,12 @@ if [ $? -gt 1 ]; then
 	/sbin/sulogin -p
 	echo "Automatic reboot in progress..."
 	/bin/umount -a -r
-	/bin/mount -n -o remount,ro /
+	/bin/mount -o remount,ro /
 	/sbin/reboot -f
 	exit 0
 fi
 
 # Mount local filesystems
-/bin/mount -n -o remount,rw /
-/bin/umount /sys /proc
-/bin/rm -f /etc/mtab*
-/bin/touch /etc/mtab
 /bin/mount -o remount,rw /
 /bin/mount -a -O no_netdev