diff options
| author | Thomas Bächler <thomas@archlinux.org> | 2006-12-18 21:54:53 +0000 |
|---|---|---|
| committer | Thomas Bächler <thomas@archlinux.org> | 2006-12-18 21:54:53 +0000 |
| commit | c323a4ae268d20d293351dc5e195e34d19ed28e7 (patch) | |
| tree | a83c8bb6a5040b072a65fb346796fa65cba61d20 | |
| parent | f9b90969a7669044f098b90babe203b145bf55a9 (diff) | |
upgpkg: initscripts 0.8-2
finally fixed 5445
| -rwxr-xr-x | rc.shutdown | 4 | ||||
| -rwxr-xr-x | rc.sysinit | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/rc.shutdown b/rc.shutdown index 8befcf8..e242b97 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -55,6 +55,10 @@ stat_busy "Saving Random Seed" stat_done stat_busy "Saving System Clock" +if [ "$TIMEZONE" != "" -a -e /usr/share/zoneinfo/$TIMEZONE ]; then + /bin/rm -f /etc/localtime + /bin/cp /usr/share/zoneinfo/$TIMEZONE /etc/localtime +fi if [ "$HARDWARECLOCK" = "UTC" ]; then /sbin/hwclock --directisa --utc --systohc else @@ -153,9 +153,9 @@ status "Mounting Root Read-only" /bin/mount -n -o remount,ro / # Clock is set again later to match rc.conf if [ -f /etc/localtime ]; then if [ "$HARDWARECLOCK" = "UTC" ]; then - /sbin/hwclock --directisa --utc --hctosys + /sbin/hwclock --directisa --utc --hctosys --noadjfile else - /sbin/hwclock --directisa --localtime --hctosys + /sbin/hwclock --directisa --localtime --hctosys --noadjfile fi fi @@ -229,17 +229,18 @@ stat_done status "Activating Swap" /sbin/swapon -a stat_busy "Configuring System Clock" -if [ "$TIMEZONE" != "" ]; then - /bin/ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime +if [ ! -f /var/lib/hwclock/adjtime ]; then + echo "0.0 0 0.0" > /var/lib/hwclock/adjtime +fi +if [ "$TIMEZONE" != "" -a -e /usr/share/zoneinfo/$TIMEZONE ]; then + /bin/rm -f /etc/localtime + /bin/cp /usr/share/zoneinfo/$TIMEZONE /etc/localtime fi if [ "$HARDWARECLOCK" = "UTC" ]; then /sbin/hwclock --directisa --utc --hctosys else /sbin/hwclock --directisa --localtime --hctosys fi -if [ ! -f /var/lib/hwclock/adjtime ]; then - echo "0.0 0 0.0" > /var/lib/hwclock/adjtime -fi stat_done if [ -f /var/run/random-seed ]; then |