aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-09-20 16:26:48 +0000
committerBill Nottingham <notting@redhat.com>2005-09-20 16:26:48 +0000
commit3c73258a880ee9dfd3ce7d8a0e01a336dea376b4 (patch)
tree1354e37cecc582d40bd4db88f15023cca30542fd /rc.d
parentef7eb44e81aefd3def7151870224823982f06e66 (diff)
downloadinitscripts-3c73258a880ee9dfd3ce7d8a0e01a336dea376b4.tar
initscripts-3c73258a880ee9dfd3ce7d8a0e01a336dea376b4.tar.gz
initscripts-3c73258a880ee9dfd3ce7d8a0e01a336dea376b4.tar.bz2
initscripts-3c73258a880ee9dfd3ce7d8a0e01a336dea376b4.tar.xz
initscripts-3c73258a880ee9dfd3ce7d8a0e01a336dea376b4.zip
move clock earlier, remove echo for font
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/rc.sysinit79
1 files changed, 39 insertions, 40 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 24791941..81607ead 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -70,7 +70,6 @@ relabel_selinux() {
}
if [ "$CONSOLETYPE" = "vt" -a -x /sbin/setsysfont ]; then
- echo -n "Setting default font ($SYSFONT): "
/sbin/setsysfont
if [ $? -eq 0 ]; then
success
@@ -103,6 +102,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`" /bin/true
+
# Fix console loglevel
if [ -n "$LOGLEVEL" ]; then
/bin/dmesg -n $LOGLEVEL
@@ -228,45 +266,6 @@ fi
update_boot_stage RCkernelparam
sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
-# 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`" /bin/true
-
if [ "$CONSOLETYPE" = "vt" -a -x /bin/loadkeys ]; then
KEYTABLE=
KEYMAP=