From fdd8036ba32ad88e83a61191cc4597ae060355d2 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 14:46:42 +0200
Subject: Adding live-initramfs 1.99.2-1.

---
 scripts/live-bottom/02timezone | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'scripts/live-bottom/02timezone')

diff --git a/scripts/live-bottom/02timezone b/scripts/live-bottom/02timezone
index dad3cad..e272da9 100755
--- 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..."
 
 # 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
+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}" ]
-- 
cgit v1.2.3