Adding upstream version 1.236.2.

[live-boot-grml.git] / scripts / live-bottom / 02timezone

diff --git a/scripts/live-bottom/02timezone b/scripts/live-bottom/02timezone
index dad3cad..64faf3b 100755 (executable)
--- a/scripts/live-bottom/02timezone
+++ b/scripts/live-bottom/02timezone
@@ -20,26 +20,36 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOTIMEZONE}" ]
+then
+       exit 0
+fi
+
 . /scripts/live-functions
 
-log_begin_msg "Setting timezone..."
+log_begin_msg "Setting timezone"
 
 # live-initramfs script
 
-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
+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
+
+       cp -f /root/usr/share/zoneinfo/${area}/${zone} /root/etc/localtime
 else
-    chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
+
+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
+
+       cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime
 fi
 
 if [ -n "${UTC}" ]