From: Jose V Beneyto <sepen@crux.nu>
Date: Thu, 10 Dec 2009 11:02:23 +0000 (+0100)
Subject: rc: updated to upstream 2.24
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=d9b5f70719e46ce3331c1fc9078ff05a9040784e;p=crossrootfs.git

rc: updated to upstream 2.24
---

diff --git a/rc/.md5sum b/rc/.md5sum
index 62af0e2..8322fcc 100644
--- a/rc/.md5sum
+++ b/rc/.md5sum
@@ -1,6 +1,6 @@
-82083bae2058cfb1d4f8764bfb309e3e  inittab
-32f67e5e22c9048054541117be84582f  rc
-a9d2ef04be098b44383823090ae57fc8  rc.conf
+d2a8e98a8b10ba09b2a9da34326b526a  inittab
+d60fc342d2498974828a276bd5fe902b  rc
+c8fe38143dffbbc628a7a33966fae408  rc.conf
 5b09d4a67beb58022879fa9ce0f5af1b  rc.fix
 d1be35927946756c68242f29c16ee983  rc.local
 394d5cff98ab59fd1a0ec64fe79292cb  rc.modules
diff --git a/rc/Pkgfile b/rc/Pkgfile
index 240a6fa..5cdebab 100644
--- a/rc/Pkgfile
+++ b/rc/Pkgfile
@@ -1,12 +1,12 @@
 # Description: BSD-like init-scripts
 # URL: http://crux.nu
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX ARM System Team
+# Arch Maintainer: CRUX ARM System Team, crux-arm at mikeux dot dyndns dot org
 # Depends on:
 
 name=rc
-version=2.21
-release=8
+version=2.24
+release=1
 source=(inittab rc rc.modules rc.single rc.multi rc.local rc.fix rc.shutdown rc.conf)
 
 build() {
diff --git a/rc/inittab b/rc/inittab
index 0cffa2a..ba613fd 100644
--- a/rc/inittab
+++ b/rc/inittab
@@ -23,6 +23,7 @@ c3:2:respawn:/sbin/agetty 38400 tty3 linux
 c4:2:respawn:/sbin/agetty 38400 tty4 linux
 c5:2:respawn:/sbin/agetty 38400 tty5 linux
 c6:2:respawn:/sbin/agetty 38400 tty6 linux
+#s1:2:respawn:/sbin/agetty 38400 ttyS0 vt100
 
 ca::ctrlaltdel:/sbin/shutdown -t3 -r now
 
diff --git a/rc/rc b/rc/rc
old mode 100755
new mode 100644
index f26e95f..82518f1
--- a/rc/rc
+++ b/rc/rc
@@ -3,7 +3,7 @@
 # /etc/rc: system boot script
 #
 
-echo "The system is coming up. Please wait."
+echo "The system is coming up.  Please wait."
 
 # Load configuration
 . /etc/rc.conf
@@ -13,6 +13,12 @@ echo "The system is coming up. Please wait."
 /bin/mount -n -t sysfs none /sys
 /sbin/start_udev
 
+# Create device-mapper device nodes and scan for LVM volume groups
+if [ -x /sbin/lvm ]; then
+	/sbin/vgscan --mknodes --ignorelockingfailure
+	/sbin/vgchange --ignorelockingfailure -a y
+fi
+
 # Mount root read-only
 /bin/mount -n -o remount,ro /
 
@@ -51,8 +57,7 @@ fi
 
 # Clean up misc files
 : > /var/run/utmp
-/bin/rm -rf /forcefsck /fastboot /halt /poweroff
-/bin/rm -rf /etc/nologin /etc/shutdownpid
+/bin/rm -rf /forcefsck /fastboot /etc/nologin /etc/shutdownpid
 (cd /var/run && /usr/bin/find . -name "*.pid" -delete)
 (cd /var/lock && /usr/bin/find . ! -type d -delete)
 (cd /tmp && /usr/bin/find . ! -name . -delete)
@@ -77,7 +82,7 @@ fi
 if [ "$TIMEZONE" ]; then
 	/bin/ln -snf /usr/share/zoneinfo/$TIMEZONE /etc/localtime
 fi
-#/sbin/hwclock --hctosys
+/sbin/hwclock --hctosys
 
 # Load console font
 if [ "$FONT" ]; then
@@ -88,11 +93,11 @@ fi
 # Load console keymap
 if [ "$KEYMAP" ]; then
 	echo "keyboard: $KEYMAP"
-	/bin/loadkeys -q $KEYMAP
+	/usr/bin/loadkeys -q $KEYMAP
 fi
 
-# Screen blanks after 5 minutes idle time
-/usr/bin/setterm -blank 5
+# Screen blanks after 15 minutes idle time
+/usr/bin/setterm -blank 15
 
 # Run module initialization script
 if [ -x /etc/rc.modules ]; then
diff --git a/rc/rc#2.24-1.pkg.tar.gz b/rc/rc#2.24-1.pkg.tar.gz
new file mode 100644
index 0000000..fb12cba
Binary files /dev/null and b/rc/rc#2.24-1.pkg.tar.gz differ
diff --git a/rc/rc.conf b/rc/rc.conf
index 0b80d2c..6c28c05 100644
--- a/rc/rc.conf
+++ b/rc/rc.conf
@@ -5,8 +5,8 @@
 FONT=default
 KEYMAP=us
 TIMEZONE=UTC
-HOSTNAME=j72x
+HOSTNAME=host
 SYSLOG=sysklogd
-SERVICES=()
+SERVICES=(net crond)
 
 # End of file
diff --git a/rc/rc.fix b/rc/rc.fix
old mode 100755
new mode 100644
diff --git a/rc/rc.local b/rc/rc.local
old mode 100755
new mode 100644
diff --git a/rc/rc.modules b/rc/rc.modules
old mode 100755
new mode 100644
diff --git a/rc/rc.multi b/rc/rc.multi
old mode 100755
new mode 100644
diff --git a/rc/rc.single b/rc/rc.single
old mode 100755
new mode 100644