[SCM] live-config branch, debian, updated. debian/2.0_a15-1-14-g3a28bbc

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit dad71af1dc7772e43607ff1b05d28ee30030d7d4
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jul 19 21:47:20 2010 +0200

    Simplyfing tzdata script.

diff --git a/scripts/config/005-tzdata b/scripts/config/005-tzdata
index 6c3879f..f2f1c9b 100755
--- a/scripts/config/005-tzdata
+++ b/scripts/config/005-tzdata
@@ -28,22 +28,17 @@ Configure_tzdata ()
 	then
 		_AREA="$(echo ${LIVE_TIMEZONE} | cut -f1 -d '/')"
 		_ZONE="$(echo ${LIVE_TIMEZONE} | cut -f2 -d '/')"
+	else
+		_AREA="Etc"
+		_ZONE="UTC"
+	fi
 
 debconf-communicate -fnoninteractive live-config > /dev/null << EOF
 set tzdata/Areas ${_AREA}
 set tzdata/Zones/${_AREA} ${_ZONE}
 EOF
 
-		cp -f /usr/share/zoneinfo/${_AREA}/${_ZONE} /etc/localtime
-	else
-
-debconf-communicate -fnoninteractive live-config > /dev/null << EOF
-set tzdata/Areas Etc
-set tzdata/Zones/Etc UTC
-EOF
-
-		cp -f /usr/share/zoneinfo/UTC /etc/localtime
-	fi
+	cp -f /usr/share/zoneinfo/${_AREA}/${_ZONE} /etc/localtime
 
 	if [ -n "${LIVE_UTC}" ]
 	then

-- 
live-config