diff options
| author | Tom Gundersen <teg@jklm.no> | 2011-03-30 17:27:24 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2011-03-30 17:27:24 +0200 |
| commit | 9ddc3214babae7110ca80dad12d6b0d74d75defd (patch) | |
| tree | 5f0614be21d3ab445a46716aa53550b61fc7b646 /rc.shutdown | |
| parent | 32272781b1d49496bcc5b6ce4394192e0f7306a3 (diff) | |
| parent | 5bf3735ba6b03c3ec754e713174a5964f8a0151a (diff) | |
| download | initscripts-9ddc3214babae7110ca80dad12d6b0d74d75defd.tar.xz | |
Merge branch 'hwclock-from-kurt' into arch-master
Conflicts:
rc.shutdown
rc.sysinit
Diffstat (limited to 'rc.shutdown')
| -rwxr-xr-x | rc.shutdown | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/rc.shutdown b/rc.shutdown index 499459f..f588058 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -35,21 +35,12 @@ fi /bin/dd if=/dev/urandom of=$RANDOM_SEED count=1 bs=$POOL_SIZE &> /dev/null stat_done -stat_busy "Saving System Clock" if [[ $TIMEZONE && -e /usr/share/zoneinfo/$TIMEZONE ]]; then /bin/rm -f /etc/localtime - /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime + status "Saving Time Zone" \ + /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime fi -HWCLOCK_PARAMS="--systohc" -case $HARDWARECLOCK in - UTC) HWCLOCK_PARAMS="$HWCLOCK_PARAMS --utc";; - localtime) HWCLOCK_PARAMS="$HWCLOCK_PARAMS --localtime";; - *) HWCLOCK_PARAMS="";; -esac -[[ $HWCLOCK_PARAMS ]] && /sbin/hwclock $HWCLOCK_PARAMS -stat_done - # removing psmouse module to fix some reboot issues on newer laptops /sbin/modprobe -r psmouse >/dev/null 2>&1 |