summaryrefslogtreecommitdiff
path: root/rc.sysinit
diff options
context:
space:
mode:
authorKurt J. Bosch <kjb-temp-2009@alpenjodel.de>2011-06-24 11:46:36 +0200
committerKurt J. Bosch <kjb-temp-2009@alpenjodel.de>2011-06-24 13:52:58 +0200
commit727acff0c55abdacde0cc8832f18fed729bccc5a (patch)
tree6b996aa69f4e3eda3e57bd804e4f51cd6251f1b9 /rc.sysinit
parent31e27d48c25495857d052964b59ba387cb809bba (diff)
Simplify timezone copying
Error/stat_fail when $TIMEZONE is invalid instead of skipping silently.
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-xrc.sysinit5
1 files changed, 2 insertions, 3 deletions
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