aboutsummaryrefslogtreecommitdiff
path: root/rc.conf
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2011-03-30 17:27:24 +0200
committerTom Gundersen <teg@jklm.no>2011-03-30 17:27:24 +0200
commit9ddc3214babae7110ca80dad12d6b0d74d75defd (patch)
tree5f0614be21d3ab445a46716aa53550b61fc7b646 /rc.conf
parent32272781b1d49496bcc5b6ce4394192e0f7306a3 (diff)
parent5bf3735ba6b03c3ec754e713174a5964f8a0151a (diff)
downloadinitscripts-9ddc3214babae7110ca80dad12d6b0d74d75defd.tar.xz
Merge branch 'hwclock-from-kurt' into arch-master
Conflicts: rc.shutdown rc.sysinit
Diffstat (limited to 'rc.conf')
-rw-r--r--rc.conf8
1 files changed, 6 insertions, 2 deletions
diff --git a/rc.conf b/rc.conf
index d2b0517..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=
@@ -105,4 +106,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)