diff options
| author | Harald Hoyer <harald@redhat.com> | 2007-08-02 14:44:26 +0000 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2007-08-02 14:44:26 +0000 |
| commit | 1fc83f68b6616a081182a361f8204e11f5adc48d (patch) | |
| tree | 79bfcaa9ae37af1d63a1728bad93e2ea9f4fd313 | |
| parent | 9f5b901ae8296f16891ca3180936b99624fec607 (diff) | |
| download | initscripts-1fc83f68b6616a081182a361f8204e11f5adc48d.tar initscripts-1fc83f68b6616a081182a361f8204e11f5adc48d.tar.gz initscripts-1fc83f68b6616a081182a361f8204e11f5adc48d.tar.bz2 initscripts-1fc83f68b6616a081182a361f8204e11f5adc48d.tar.xz initscripts-1fc83f68b6616a081182a361f8204e11f5adc48d.zip | |
- set the hwclock before start_udev is executed
| -rwxr-xr-x | rc.d/rc.sysinit | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 1ec9c2a8..0e60ff63 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -120,6 +120,45 @@ if [ "$PROMPT" != "no" ]; then echo fi +# Set the system clock. +update_boot_stage RCclock +ARC=0 +SRM=0 +UTC=0 + +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 +fi + +CLOCKDEF="" +CLOCKFLAGS="$CLOCKFLAGS --hctosys" + +case "$UTC" in + yes|true) CLOCKFLAGS="$CLOCKFLAGS --utc" + CLOCKDEF="$CLOCKDEF (utc)" ;; + no|false) CLOCKFLAGS="$CLOCKFLAGS --localtime" + CLOCKDEF="$CLOCKDEF (localtime)" ;; +esac +case "$ARC" in + yes|true) CLOCKFLAGS="$CLOCKFLAGS --arc" + CLOCKDEF="$CLOCKDEF (arc)" ;; +esac +case "$SRM" in + yes|true) CLOCKFLAGS="$CLOCKFLAGS --srm" + CLOCKDEF="$CLOCKDEF (srm)" ;; +esac + +/sbin/hwclock $CLOCKFLAGS + +action $"Setting clock $CLOCKDEF: `date`" date + # Fix console loglevel if [ -n "$LOGLEVEL" ]; then /bin/dmesg -n $LOGLEVEL @@ -239,45 +278,6 @@ fi update_boot_stage RCkernelparam action $"Configuring kernel parameters: " sysctl -e -p /etc/sysctl.conf -# Set the system clock. -update_boot_stage RCclock -ARC=0 -SRM=0 -UTC=0 - -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 -fi - -CLOCKDEF="" -CLOCKFLAGS="$CLOCKFLAGS --hctosys" - -case "$UTC" in - yes|true) CLOCKFLAGS="$CLOCKFLAGS --utc" - CLOCKDEF="$CLOCKDEF (utc)" ;; - no|false) CLOCKFLAGS="$CLOCKFLAGS --localtime" - CLOCKDEF="$CLOCKDEF (localtime)" ;; -esac -case "$ARC" in - yes|true) CLOCKFLAGS="$CLOCKFLAGS --arc" - CLOCKDEF="$CLOCKDEF (arc)" ;; -esac -case "$SRM" in - yes|true) CLOCKFLAGS="$CLOCKFLAGS --srm" - CLOCKDEF="$CLOCKDEF (srm)" ;; -esac - -/sbin/hwclock $CLOCKFLAGS - -action $"Setting clock $CLOCKDEF: `date`" date - if [ -x /bin/loadkeys ]; then KEYTABLE= KEYMAP= |