diff options
| author | Roy Marples <roy@marples.name> | 2007-10-24 08:50:14 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-10-24 08:50:14 +0000 |
| commit | 1a673aa11726041a1e5f33364fa893a29c83b313 (patch) | |
| tree | c5f1671a3bcc1db539dda0bc97780e40c91b2ea8 | |
| parent | 9bb59a93f2c544b58c1ee3575c50f17d3a27cfc1 (diff) | |
Advise not syncing time when running ntp daemons
| -rw-r--r-- | conf.d/clock | 1 | ||||
| -rwxr-xr-x | init.d.Linux/clock | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/conf.d/clock b/conf.d/clock index 6ce7e107..579200ce 100644 --- a/conf.d/clock +++ b/conf.d/clock @@ -8,6 +8,7 @@ CLOCK="UTC" # If you want to set the Hardware Clock to the current System Time # during shutdown, then say "yes" here. +# You normally don't need to do this if you run a ntp daemon. CLOCK_SYSTOHC="no" # Select the proper timezone. For valid values, peek inside of the diff --git a/init.d.Linux/clock b/init.d.Linux/clock index e5b70390..a52f9ab1 100755 --- a/init.d.Linux/clock +++ b/init.d.Linux/clock @@ -6,6 +6,7 @@ opts="save show" description="Sets the local clock to UTC or Local Time." description_save="Saves the current time in the BIOS." +description_show="Displays the current time in the BIOS." depend() { if [ "${CLOCK_ADJFILE}" = "yes" ]; then @@ -98,8 +99,8 @@ stop() { ebegin "Setting hardware clock using the system clock" "[${TBLURB}]" if [ -n "${utc}" ]; then if [ "${CLOCK_ADJFILE}" != "yes" ]; then - # If we have adjtimex then we're probably busybox - if ! type adjtimex >/dev/null 2>&1; then + # Some implementations don't handle adjustments + if LC_ALL=C hwclock --help | grep -q "\-\-noadjfile"; then utc="${utc} --noadjfile" fi fi |