From fd8fde036ab46b593590b362bc94b051e432a295 Mon Sep 17 00:00:00 2001
From: Judd Vinet <judd@archlinux.org>
Date: Wed, 24 Jul 2002 02:57:16 +0000
Subject: Upgraded initscripts to 0.3

---
 rc.sysinit | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

(limited to 'rc.sysinit')

diff --git a/rc.sysinit b/rc.sysinit
index 047ceeb..2d257a4 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -13,14 +13,11 @@ echo    "                              ]"
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-stat_busy "Starting DevFS Daemon"
-checkret /sbin/devfsd /dev
+status "Starting DevFS Daemon" /sbin/devfsd /dev
 
-stat_busy "Activating Swap"
-checkret /sbin/swapon -a
+status "Activating Swap" /sbin/swapon -a
 
-stat_busy "Mounting Root Read-only"
-checkret /bin/mount -n -o remount,ro /
+status "Mounting Root Read-only" /bin/mount -n -o remount,ro /
 
 stat_busy "Checking Filesystems"
 /sbin/fsck -A -T -C -a
@@ -61,29 +58,21 @@ stat_busy "Removing Leftover Files"
 : > /var/run/utmp
 stat_done
 
-stat_busy "Updating Shared Library Links"
-/sbin/ldconfig
-stat_done
+status "Updating Shared Library Links" /sbin/ldconfig
 
 if [ "$HOSTNAME" != "" ]; then
-  stat_busy "Setting Hostname: $HOSTNAME"
-  checkret /bin/hostname $HOSTNAME
+  status "Setting Hostname: $HOSTNAME" /bin/hostname $HOSTNAME
 fi
 
-stat_busy "Starting System Logger"
-checkret /usr/sbin/syslogd -m 0
+status "Starting System Logger" /usr/sbin/syslogd -m 0
 
-stat_busy "Starting Kernel Logger"
-checkret /usr/sbin/klogd -c 4
+status "Starting Kernel Logger" /usr/sbin/klogd -c 4
 
-stat_busy "Updating Module Dependencies"
-checkret /sbin/depmod -a
+status "Updating Module Dependencies" /sbin/depmod -a
 
-stat_busy "Initializing Random Seed"
 if [ -f /var/run/random-seed ]; then
-  /bin/cat /var/run/random-seed > /dev/urandom
+	status "Initializing Random Seed" /bin/cat /var/run/random-seed > /dev/urandom
 fi
-stat_done
 
 stat_busy "Configuring System Clock"
 if [ ! -f /etc/adjtime ]; then
@@ -96,9 +85,7 @@ fi
 stat_done
 
 if [ "$KEYMAP" != "" ]; then
-  stat_busy "Loading Keyboard Map: $KEYMAP"
-  /bin/loadkeys -q $KEYMAP
-  stat_done
+  status "Loading Keyboard Map: $KEYMAP" /bin/loadkeys -q $KEYMAP
 fi
 
 # Screen blanks after 15 minutes idle time
-- 
cgit v1.2.3