[SCM] live-initramfs branch, debian-next, updated. debian/1.236.2-1-3-gfbf1f1f

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit fbf1f1f85840332be2a0a86a2f24406ef532581b
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri May 21 14:44:06 2010 +0200

    Removing timezone live-bottom script, moved to live-config.

diff --git a/scripts/live b/scripts/live
index fcdbad0..a27abd1 100755
--- a/scripts/live
+++ b/scripts/live
@@ -453,11 +453,6 @@ Arguments ()
 				export UNIONTYPE
 				;;
 
-			utc=*)
-				UTC="${ARGUMENT#utc=}"
-				export UTC
-				;;
-
 			xdebconf)
 				XDEBCONF="Yes"
 				export XDEBCONF
diff --git a/scripts/live-bottom/02timezone b/scripts/live-bottom/02timezone
deleted file mode 100755
index 64faf3b..0000000
--- a/scripts/live-bottom/02timezone
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-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
-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

-- 
live-initramfs