aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2006-05-23 19:28:54 +0000
committerBill Nottingham <notting@redhat.com>2006-05-23 19:28:54 +0000
commit020f2072eb740830873be85d98b421839ff3960c (patch)
tree699e266819c18a2ce41be5e36d9c552199325f33 /rc.d
parent9706e39ef0c1da41b351d4a59fed7f409874eb4c (diff)
downloadinitscripts-020f2072eb740830873be85d98b421839ff3960c.tar
initscripts-020f2072eb740830873be85d98b421839ff3960c.tar.gz
initscripts-020f2072eb740830873be85d98b421839ff3960c.tar.bz2
initscripts-020f2072eb740830873be85d98b421839ff3960c.tar.xz
initscripts-020f2072eb740830873be85d98b421839ff3960c.zip
integrate s390 patch - just check for hwclock before running it
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/init.d/halt2
-rwxr-xr-xrc.d/rc.sysinit2
2 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index d1ff19bf..60485da7 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -111,7 +111,7 @@ case "$SRM" in
;;
esac
-action $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS
+[ -x /sbin/hwclock ] && action $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS
# Try to unmount tmpfs filesystems to avoid swapping them in. Ignore failures.
tmpfs=$(awk '$2 ~ /^\/($|proc|dev)/ { next; }
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index c5278f0b..9e73cc27 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -140,7 +140,7 @@ case "$SRM" in
CLOCKDEF="$CLOCKDEF (srm)" ;;
esac
-/sbin/hwclock $CLOCKFLAGS
+[ -x /sbin/hwclock ] && /sbin/hwclock $CLOCKFLAGS
action $"Setting clock $CLOCKDEF: `date`" /bin/true