CVS: initscripts/rc.d rc.sysinit,1.3,1.4

[Jasper Huysmans]

Update of /var/cvs/lunar/initscripts/rc.d
In directory dbguin.lunar-linux.org:/tmp/cvs-serv27642

Modified Files:
	rc.sysinit 
Log Message:
Comments. Minor tweak. Nothing to see here

Index: rc.sysinit
===================================================================
RCS file: /var/cvs/lunar/initscripts/rc.d/rc.sysinit,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rc.sysinit	30 Oct 2003 12:47:34 -0000	1.3
+++ rc.sysinit	31 Oct 2003 12:06:07 -0000	1.4
@@ -49,17 +49,12 @@
 
 if [ "$CONSOLETYPE" = "vt" -a -x /sbin/setsysfont ]; then
   echo -n "Setting default font ($SYSFONT): "
-  /sbin/setsysfont
-  if [ $? -eq 0 ]; then
-    success
-  else
-    failure
-  fi
+  /sbin/setsysfont && success || failure
   echo ; echo
 fi
 
 # Print a text banner.
-echo -en $"\t\tWelcome to "
+echo -en $"\tWelcome to "
 if LC_ALL=C grep -q "Lunar Linux" /etc/lunar.release ; then 
   [ "$BOOTUP" = "color" ] && echo -en "\\033[0;31m"
   echo -en "Lunar Linux"
@@ -71,9 +66,10 @@
   echo "$PRODUCT"
 fi
 if [ "$PROMPT" != "no" ]; then
-  echo -en $"\t\tPress 'I' to enter interactive startup."
+  echo -en $"\tPress 'I' to enter interactive startup."
   echo
 fi
+echo
 
 # Fix console loglevel
 if [ -n "$LOGLEVEL" ]; then
@@ -111,12 +107,12 @@
 if [ -f /etc/sysconfig/clock ]; then
   . /etc/sysconfig/clock
 
-   # convert old style clock config to new values
-  if [ "${CLOCKMODE}" = "GMT" ]; then
-    UTC=true
-  elif [ "${CLOCKMODE}" = "ARC" ]; then
-    ARC=true
-  fi
+  # convert old style clock config to new values
+   # if [ "${CLOCKMODE}" = "GMT" ]; then
+   #   UTC=true
+   # elif [ "${CLOCKMODE}" = "ARC" ]; then
+   #   ARC=true
+   # fi
 fi
 
 CLOCKDEF=""
@@ -156,7 +152,7 @@
     fi
   fi
   if [ -n "$KEYMAP" ]; then 
-  # Since this takes in/output from stdin/out, we can't use initlog
+    # Since this takes in/output from stdin/out, we can't use initlog
     if [ -n "$KEYTABLE" ]; then
       echo -n $"Loading default keymap ($KEYTABLE): "
     else
@@ -202,8 +198,9 @@
 needusbstorage=
 if [ $usb = "1" ]; then
   needusbstorage=`LC_ALL=C grep -e "^I.*Cls=08" /proc/bus/usb/devices 2>/dev/null`
-  LC_ALL=C grep 'hid' /proc/bus/usb/drivers || \
+  LC_ALL=C grep -q 'hid' /proc/bus/usb/drivers 2>/dev/null || \
     action $"Initializing USB HID interface: " modprobe hid 2> /dev/null
+  # FIXME: is this 2.4 specific ?
   action $"Initializing USB keyboard: " modprobe keybdev 2> /dev/null
   action $"Initializing USB mouse: " modprobe mousedev 2> /dev/null 
 fi
@@ -317,6 +314,7 @@
   action $"Checking root filesystem quotas: " /sbin/quotacheck -nug /
 fi
 
+# ISA PNP
 if [ -x /sbin/isapnp -a -f /etc/isapnp.conf -a ! -f /proc/isapnp ]; then
   # check for arguments passed from kernel
   if ! strstr "$cmdline" nopnp ; then
@@ -360,7 +358,6 @@
 [ -e /dev/.devfsd ] && mount -f -t devfs devfs /dev 
 
 
-
 # The root filesystem is now read-write, so we can now log
 # via syslog() directly..
 unset IN_INITLOG
@@ -375,7 +372,7 @@
 # the preferred link.
 rm -f /lib/modules/preferred /lib/modules/default
 if [ -x /sbin/depmod -a -n "$USEMODULES" ]; then
-    # If they aren't using a recent sane kernel, make a link for them
+  # If they aren't using a recent sane kernel, make a link for them
   if ! strstr $unamer -  ; then
     ktag="`cat /proc/version`"
     mtag=`LC_ALL=C grep -l "$ktag" /lib/modules/*/.rhkmvtag 2> /dev/null`
@@ -386,7 +383,7 @@
     if [ -n "$mver" ]; then
       ln -sf /lib/modules/$mver /lib/modules/default
     fi
-  fi
+   fi
   if [ -L /lib/modules/default ]; then
     INITLOG_ARGS= action $"Finding module dependencies: " depmod -A default
   else
@@ -416,7 +413,7 @@
     sysctl -w kernel.modprobe="/sbin/modprobe" >/dev/null 2>&1
     sysctl -w kernel.hotplug="/sbin/hotplug" >/dev/null 2>&1
   else
-       # We used to set this to NULL, but that causes 'failed to exec' messages"
+    # We used to set this to NULL, but that causes 'failed to exec' messages"
     sysctl -w kernel.modprobe="/bin/true" >/dev/null 2>&1
     sysctl -w kernel.hotplug="/bin/true" >/dev/null 2>&1
   fi