diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-10-30 01:40:41 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-10-30 01:40:41 -0300 |
commit | c3d6cdb72f7130d3361bc1b8c99e862fe15a75fa (patch) | |
tree | b664bed188c0de713be8a4649fdd86664d1c2867 /hwclock | |
parent | ede246d73091a7b733ae56819fc7296e18aa4c31 (diff) | |
parent | 00070eca730dec9c6d587cc1639f6abaca83fa34 (diff) |
Merge branch 'master' of git://projects.archlinux.org/initscripts2011.10.3
Conflicts:
PKGBUILD
Diffstat (limited to 'hwclock')
-rwxr-xr-x | hwclock | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -13,11 +13,7 @@ case "$1" in start) add_daemon hwclock;; stop) - case $HARDWARECLOCK in - UTC) hwclock --adjust --utc;; - localtime) hwclock --adjust --localtime;; - "") hwclock --adjust;; - esac + hwclock --adjust $HWCLOCK_PARAMS rm_daemon hwclock ;; restart) |