From 727acff0c55abdacde0cc8832f18fed729bccc5a Mon Sep 17 00:00:00 2001 From: "Kurt J. Bosch" Date: Fri, 24 Jun 2011 11:46:36 +0200 Subject: Simplify timezone copying Error/stat_fail when $TIMEZONE is invalid instead of skipping silently. --- rc.shutdown | 5 ++--- rc.sysinit | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rc.shutdown b/rc.shutdown index 637974f..4014df2 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -35,10 +35,9 @@ fi dd if=/dev/urandom of=$RANDOM_SEED count=1 bs=$POOL_SIZE &> /dev/null stat_done -if [[ $TIMEZONE && -e /usr/share/zoneinfo/$TIMEZONE ]]; then - rm -f /etc/localtime +if [[ $TIMEZONE ]]; then status "Saving Time Zone" \ - cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime + cp --remove-destination "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime fi # Write to wtmp file before unmounting diff --git a/rc.sysinit b/rc.sysinit index e4c1c36..6c1fef9 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -238,10 +238,9 @@ fi status "Activating Swap" swapon -a -if [[ $TIMEZONE && -e /usr/share/zoneinfo/$TIMEZONE ]]; then - rm -f /etc/localtime +if [[ $TIMEZONE ]]; then status "Configuring Time Zone" \ - cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime + cp --remove-destination "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime fi RANDOM_SEED=/var/lib/misc/random-seed -- cgit v1.2.3