From 29a29c75e68bedd0b47d70de1e8eac83ffe23a13 Mon Sep 17 00:00:00 2001 From: "Kurt J. Bosch" Date: Mon, 28 Mar 2011 19:06:05 +0200 Subject: Make hwclock --adjust as well as --systohc optional (FS#13684) Signed-off-by: Tom Gundersen --- rc.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'rc.conf') diff --git a/rc.conf b/rc.conf index d2b0517..0b0a818 100644 --- a/rc.conf +++ b/rc.conf @@ -105,4 +105,7 @@ NETWORK_PERSIST="no" # - prefix a daemon with a ! to disable it # - prefix a daemon with a @ to start it up in the background # -DAEMONS=(syslog-ng network netfs crond) +# If something other takes care of your hardware clock (ntpd, dual-boot...) +# you should disable 'hwclock' here. +# +DAEMONS=(hwclock syslog-ng network netfs crond) -- cgit v1.2.3 From 5bf3735ba6b03c3ec754e713174a5964f8a0151a Mon Sep 17 00:00:00 2001 From: "Kurt J. Bosch" Date: Mon, 28 Mar 2011 19:07:34 +0200 Subject: Change hardware clock default to UTC Signed-off-by: Tom Gundersen --- rc.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rc.conf') diff --git a/rc.conf b/rc.conf index 0b0a818..02bb1d7 100644 --- a/rc.conf +++ b/rc.conf @@ -11,6 +11,7 @@ # process. If set to 'no', the C locale will be 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. # TIMEZONE: timezones are found in /usr/share/zoneinfo # KEYMAP: keymaps are found in /usr/share/kbd/keymaps # CONSOLEFONT: found in /usr/share/kbd/consolefonts (only needed for non-US) @@ -19,7 +20,7 @@ # LOCALE="en_US.UTF-8" DAEMON_LOCALE="no" -HARDWARECLOCK="localtime" +HARDWARECLOCK="UTC" TIMEZONE="Canada/Pacific" KEYMAP="us" CONSOLEFONT= -- cgit v1.2.3