aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/rc.sysinit
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>1999-06-17 15:04:54 +0000
committerBill Nottingham <notting@redhat.com>1999-06-17 15:04:54 +0000
commit672a334d85cbd7dc7a7848f026b516760468387e (patch)
tree2e33196a071436870e90a891f5cfcd2f4495bb90 /rc.d/rc.sysinit
parent2b7bb223b166e97f6a96b62204e9447ff82f924a (diff)
downloadinitscripts-672a334d85cbd7dc7a7848f026b516760468387e.tar
initscripts-672a334d85cbd7dc7a7848f026b516760468387e.tar.gz
initscripts-672a334d85cbd7dc7a7848f026b516760468387e.tar.bz2
initscripts-672a334d85cbd7dc7a7848f026b516760468387e.tar.xz
initscripts-672a334d85cbd7dc7a7848f026b516760468387e.zip
set the clock if we can read the /etc/localtime link, too
Diffstat (limited to 'rc.d/rc.sysinit')
-rwxr-xr-xrc.d/rc.sysinit6
1 files changed, 4 insertions, 2 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 0ddb45ed..86539176 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -27,6 +27,7 @@ fi
set_the_clock() {
# Set the system clock.
+ _CLOCK_SET=1
ARC=0
UTC=0
if [ -f /etc/sysconfig/clock ]; then
@@ -74,8 +75,9 @@ set_the_clock() {
# Fix console loglevel
/sbin/loglevel $LOGLEVEL
+_CLOCK_SET=0
# Set clock, if we can...
-if [ -f /etc/localtime ]; then
+if [ -f /etc/localtime ] || cat /etc/localtime >/dev/null 2>&1; then
set_the_clock
fi
@@ -369,7 +371,7 @@ rm -f /tmp/.X*-lock
rm -f /tmp/.s.PGSQL.*
# If we didn't set the clock before, set it now...
-if [ ! -f /etc/localtime ]; then
+if [ "$_CLOCK_SET" != "1" ]; then
set_the_clock
fi