summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2009-02-14 15:50:23 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2009-02-14 15:50:23 +0100
commitfd77cd880518f288b2c4a8d5885b41ef829db04c (patch)
tree9197dcbcd335b684d54871d400dce623e1185381
parentd860efe097ff76c511b5fdf53dc2c90752e2b85b (diff)
port of FS#13101 - simple fix to setup script writing timezone to rc.conf
-rw-r--r--src/core/procedures/interactive3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive
index dc4232a..08bdf23 100644
--- a/src/core/procedures/interactive
+++ b/src/core/procedures/interactive
@@ -120,7 +120,8 @@ worker_configure_system()
# /etc/rc.conf
# Make sure timezone and utc info are what we want
- sed -i -e "s/^TIMEZONE=.*/TIMEZONE=\"$TIMEZONE\"/g" \
+ # NOTE: If a timezone string never contains more then 1 slash, we can use ${TIMEZONE/\//\\/}
+ sed -i -e "s/^TIMEZONE=.*/TIMEZONE=\"${TIMEZONE//\//\\/}\"/g" \
-e "s/^HARDWARECLOCK=.*/HARDWARECLOCK=\"$HARDWARECLOCK\"/g" \
${var_TARGET_DIR}/etc/rc.conf