emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwclock: Clarify documentation

Browse Source 
The clock_hctosys and clock_systohc settings really do not have anything
to do with running an ntp daemon, so remove that reference from the
documentation.

Reported-by: Milos Ivanovic <milosivanovic@orcon.net.nz>
X-Gentoo-Bug: 401433
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=401433
This commit is contained in:
William Hubbs 2012-02-17 14:23:54 -06:00
parent a5509d6819
commit a21a2c3e32
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
conf.d/hwclock
View File

@ -4,18 +4,14 @@
# you should set it to "local". # you should set it to "local".
clock="UTC" clock="UTC"
# If you want to set the Hardware Clock to the current System Time
# (software clock) during shutdown, then say "YES" here.
# You normally don't need to do this if you run a ntp daemon.
clock_systohc="NO"
# If you want to set the system time to the current hardware clock # If you want to set the system time to the current hardware clock
# during bootup, then say "YES" here. You do not need this if you are # during bootup, then say "YES" here. You do not need this if you are
# running a modern kernel with CONFIG_RTC_HCTOSYS set to y. # running a modern kernel with CONFIG_RTC_HCTOSYS set to y.
# Also, be aware that if you set this to "NO", the system time will #clock_hctosys="YES"
# never be saved to the hardware clock unless you set
# clock_systohc="YES" above. # If you want to set the hardware clock to the current system time
clock_hctosys="YES" # (software clock) during shutdown, set this to yes.
#clock_systohc="NO"
# If you wish to pass any other arguments to hwclock during bootup, # If you wish to pass any other arguments to hwclock during bootup,
# you may do so here. Alpha users may wish to use --arc or --srm here. # you may do so here. Alpha users may wish to use --arc or --srm here.

4
init.d/hwclock.in
View File

@ -94,7 +94,7 @@ start()
"$utc_cmd" != --utc -o \ "$utc_cmd" != --utc -o \
-n "$clock_args" ]; -n "$clock_args" ];
then then
if yesno $clock_hctosys; then if yesno ${clock_hctosys:-YES}; then
_hwclock --hctosys $utc_cmd $clock_args _hwclock --hctosys $utc_cmd $clock_args
else else
_hwclock --systz $utc_cmd $clock_args _hwclock --systz $utc_cmd $clock_args
@ -111,7 +111,7 @@ stop()
{ {
# Don't tweak the hardware clock on LiveCD halt. # Don't tweak the hardware clock on LiveCD halt.
[ -n "$CDBOOT" ] && return 0 [ -n "$CDBOOT" ] && return 0
yesno $clock_systohc || return 0 yesno ${clock_systohc:-NO} || return 0
local retval=0 errstr="" local retval=0 errstr=""
setupopts setupopts