X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F02_timezone;h=dad3cadcb9bbed7b112ff70d7fee2a332a683710;hb=f16e48a910a229980153cafc1f2827a7e2c4ab0f;hp=bafc4266c9b621d6853835385ff1c973d09fcbab;hpb=25bcd436af6202932ad494c8ddd0a49999579924;p=live-boot-grml.git

diff --git a/scripts/live-bottom/02_timezone b/scripts/live-bottom/02_timezone
index bafc426..dad3cad 100755
--- a/scripts/live-bottom/02_timezone
+++ b/scripts/live-bottom/02_timezone
@@ -26,6 +26,25 @@ log_begin_msg "Setting timezone..."
 
 # live-initramfs script
 
-cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime
+if [ -n "${TIMEZONE}" ]; then
+    area="$(echo ${TIMEZONE} | cut -f1 -d '/')"
+    zone="$(echo ${TIMEZONE} | cut -f2 -d '/')"
+    chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
+set tzdata/Areas $area
+set tzdata/Zones/$area $zone
+EOF
+    cp -f /root/usr/share/zoneinfo/${area}/${zone} /root/etc/localtime
+else
+    chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
+set tzdata/Areas Etc
+set tzdata/Zones/Etc UTC
+EOF
+    cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime
+fi
+
+if [ -n "${UTC}" ]
+then
+	sed -i -e "s/UTC=.*/UTC=${UTC}/" /root/etc/default/rcS
+fi
 
 log_end_msg