diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 14:46:42 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:05 +0100 |
| commit | fdd8036ba32ad88e83a61191cc4597ae060355d2 (patch) | |
| tree | fe1bfc2da930128100db011d642be562ed82867e /scripts/live-bottom/02timezone | |
| parent | 140b179f0ff73f3cc1c081f6e6641417a5a0788d (diff) | |
| download | live-boot-fdd8036ba32ad88e83a61191cc4597ae060355d2.tar.gz live-boot-fdd8036ba32ad88e83a61191cc4597ae060355d2.zip | |
Adding live-initramfs 1.99.2-1.
Diffstat (limited to 'scripts/live-bottom/02timezone')
| -rwxr-xr-x | scripts/live-bottom/02timezone | 24 |
1 files changed, 17 insertions, 7 deletions
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}" ] |
