diff options
| author | Tom Gundersen <teg@jklm.no> | 2011-06-25 00:53:05 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2011-06-25 01:27:53 +0200 |
| commit | ac55830ea6cfa2c130275ebd6b4f2c0fea80130e (patch) | |
| tree | d9756cca22e0772acf615de2b9ae730e51bc1f2b | |
| parent | 5b19b901c6b00dd9b2b3a39e983b88ddd5eb874f (diff) | |
| download | initscripts-ac55830ea6cfa2c130275ebd6b4f2c0fea80130e.tar.xz | |
hwclock: use correct timezone
To avoid setting the kernel timezone with an out-of-date /etc/localtime, we pass TZ
directly to hwclock.
Also document how TIMEZONE and HARDWARECLOCK are optional in rc.conf
Signed-off-by: Tom Gundersen <teg@jklm.no>
| -rw-r--r-- | rc.conf | 4 | ||||
| -rwxr-xr-x | rc.sysinit | 11 |
2 files changed, 9 insertions, 6 deletions
@@ -11,8 +11,10 @@ # startup and during the boot process. If set to 'no', the C locale is used. # HARDWARECLOCK: set to "", "UTC" or "localtime", any other value will result # in the hardware clock being left untouched (useful for virtualization) -# Note: Using "localtime" is discouraged. +# Note: Using "localtime" is discouraged, using "" makes hwclock fall back +# to the value in /var/lib/hwclock/adjfile # TIMEZONE: timezones are found in /usr/share/zoneinfo +# Note: if unset, the value in /etc/localtime is used unchanged # KEYMAP: keymaps are found in /usr/share/kbd/keymaps # CONSOLEFONT: found in /usr/share/kbd/consolefonts (only needed for non-US) # CONSOLEMAP: found in /usr/share/kbd/consoletrans @@ -62,11 +62,12 @@ if [[ $HWCLOCK_PARAMS ]]; then # Adjust the system time for timezone offset if rtc is not in UTC # 1. Make creation time on udev nodes sane (FS#8665) # 2. Filesystem checks can depend on system time - # 3. This will set the clock, if using non-UTC, off the last known - # configured timezone. Any new timezone put in rc.conf is copied over at - # a later time. - # This also sets the kernel time zone. - [[ -f /etc/localtime ]] && hwclock $HWCLOCK_PARAMS + # 3. This also sets the kernel time zone, used by e.g. vfat + # If TIMEZONE is not set in rc.conf, the timezone stored in /etc/localtime + # is used. If HARDWARECLOCK is not set in rc.conf, the value in + # /var/lib/hwclock/adjfile is used (in this case /var can not be a separate + # partition). + TZ=$TIMEZONE && hwclock $HWCLOCK_PARAMS fi # Start/trigger UDev, load MODULES and settle UDev |