rc: update to 2.26

diff --git a/rc/.md5sum b/rc/.md5sum
index 8322fcc0c3eda8ecad01435328c53248a5a25f49..ddfaef53ac62ddb2b8737815f1a8a72ff50f9120 100644 (file)
--- a/rc/.md5sum
+++ b/rc/.md5sum
@@ -1,9 +1,9 @@
 d2a8e98a8b10ba09b2a9da34326b526a  inittab
-d60fc342d2498974828a276bd5fe902b  rc
+ef539e1a7680641ef76b38001eb86682  rc
 c8fe38143dffbbc628a7a33966fae408  rc.conf
-5b09d4a67beb58022879fa9ce0f5af1b  rc.fix
+afe5cd67920474246ae74e54a9845339  rc.fix
 d1be35927946756c68242f29c16ee983  rc.local
 394d5cff98ab59fd1a0ec64fe79292cb  rc.modules
 a2d24525ca3ff1daf5753edcdf89466b  rc.multi
-b509225319fbdcf5a2dcc1a1f9fc8783  rc.shutdown
+d3a1e6e3edad489020fd56305bed8d6f  rc.shutdown
 d8d9bd102b0177a7bb30db9fd088a6e8  rc.single

diff --git a/rc/Pkgfile b/rc/Pkgfile
index 479232df7ccaeb2d903bd8853fbed5c6196570ac..e074cf2ad79b5ddc5a81a631b9f3dca69411ccc9 100644 (file)
--- a/rc/Pkgfile
+++ b/rc/Pkgfile
@@ -2,10 +2,9 @@
 # URL: http://crux.nu
 # Maintainer: CRUX System Team, core-ports at crux dot nu
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
-# Depends on:
 
 name=rc
-version=2.24
+version=2.26
 release=1
 source=(inittab rc rc.modules rc.single rc.multi rc.local rc.fix rc.shutdown rc.conf)
 

diff --git a/rc/rc b/rc/rc
index 82518f16dea932678b52652e39340f91ceb899bf..1ae73c27cb462b7946c7fe36ba40b77e520c06f8 100644 (file)
--- a/rc/rc
+++ b/rc/rc
@@ -22,8 +22,12 @@ fi
 # Mount root read-only
 /bin/mount -n -o remount,ro /
 
+if [ -f /forcefsck ]; then
+FORCEFSCK="-f"
+fi
+
 # Check filesystems
-/sbin/fsck -A -T -C -a
+/sbin/fsck $FORCEFSCK -A -T -C -a
 if [ $? -gt 1 ]; then
        echo
        echo "***************  FILESYSTEM CHECK FAILED  ******************"

diff --git a/rc/rc.fix b/rc/rc.fix
index c0303c0300a193ce5ef3467254067906693b31c7..02ce94c0cc89fc0f51bc158ec50394711c312dca 100644 (file)
--- a/rc/rc.fix
+++ b/rc/rc.fix
@@ -7,8 +7,8 @@
 #######################################################################
 # X11 font-related checks
 #######################################################################
-if [ -d /usr/lib/X11/fonts ]; then
-    for i in `/bin/ls -d /usr/lib/X11/fonts/*`; do
+if [ -d /usr/share/fonts/X11 ]; then
+    for i in `/bin/ls -d /usr/share/fonts/X11/*`; do
         if [ ! -f $i/fonts.dir ]; then
             mkfontdir $i &> /dev/null
             mkfontscale $i &> /dev/null

diff --git a/rc/rc.shutdown b/rc/rc.shutdown
index 4888a8e0872d0a955e3bd66a8ec85427a3168cc0..790117e7f55568e64da9eb596c9f142a9fa1ba67 100755 (executable)
--- a/rc/rc.shutdown
+++ b/rc/rc.shutdown
@@ -43,6 +43,10 @@ fi
 /sbin/swapoff -a
 
 # Unmount file systems
+/bin/umount -a -r -t nosysfs,noproc
+if [ -x /sbin/lvm ]; then
+       /sbin/vgchange --ignorelockingfailure -a n
+fi
 /bin/umount -a -r
 
 # Remount root filesystem read-only