- Time setup changed, so it should work even if /usr is on separate partition

svn-id: @743

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index fe15f4208270caf8164df97eeee5012289371e1c..796b47d0910208e4f3b9b365d3ee5b2841c8d6b2 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # /etc/rc.d/rc.sysinit - run once at boot time
-# $Id: rc.sysinit,v 1.60 2000/05/16 15:08:25 zagrodzki Exp $
+# $Id: rc.sysinit,v 1.61 2000/05/20 13:34:06 jajcus Exp $
 #
 # Taken in part from Miquel van Smoorenburg's bcheckrc.
 # Changes:      Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
@@ -133,8 +133,13 @@ case "$SRM" in
      ;;
 esac
 
-if run_cmd "Setting clock$CLOCKDEF" /sbin/hwclock $CLOCKFLAGS; then
-       show "Today's date: `LC_CTYPE=C date`"; ok
+# Check if timezone definition is available
+if [ -e /etc/localtime ] ; then
+       if run_cmd "Setting clock$CLOCKDEF" /sbin/hwclock $CLOCKFLAGS; then
+               show "Today's date: `LC_CTYPE=C date`"; ok
+       fi
+else
+       TIME_SETUP_DELAYED=yes
 fi
 
 # Start up swapping.
@@ -392,6 +397,13 @@ fi
 # filesystems are NOT unmounted in single user mode.
 run_cmd "Mounting local filesystems." mount -a -t nonfs,smbfs,ncpfs,proc
 
+# Set the clock if timezone definition wasn't available (eg. /usr not mounted)
+if [ is_yes $TIME_SETUP_DELAYED ] ; then
+       if run_cmd "Setting clock$CLOCKDEF" /sbin/hwclock $CLOCKFLAGS; then
+               show "Today's date: `LC_CTYPE=C date`"; ok
+       fi
+fi
+
 # set the console font
 #if [ -x /sbin/setsysfont ]; then
 #      show "Loading default system font"; busy