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

---
 scripts/live                    |  6 +++--
 scripts/live-bottom/02_timezone | 50 -----------------------------------------
 scripts/live-bottom/02timezone  | 50 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 52 deletions(-)
 delete mode 100755 scripts/live-bottom/02_timezone
 create mode 100755 scripts/live-bottom/02timezone

(limited to 'scripts')

diff --git a/scripts/live b/scripts/live
index 97777bd..a73da84 100755
--- a/scripts/live
+++ b/scripts/live
@@ -635,8 +635,10 @@ setup_unionfs() {
     # Let's just mount the read-only file systems first
     rofsstring=""
     rofslist=""
-    if [ "${NETBOOT}" = "nfs" ] ; then
-        roopt="nfsro" # go aroung a bug in nfs-unionfs locking
+    minor_kernel_version=`uname -r|cut -c 5-|sed 's/[^0-9].*//'`
+    if [ "${NETBOOT}" = "nfs" ] && [ "${minor_kernel_version}" -lt 22 ]; then
+        # go aroung a bug in nfs-unionfs locking for unionfs <= 1.4
+        roopt="nfsro"
     else
         roopt="ro"
     fi
diff --git a/scripts/live-bottom/02_timezone b/scripts/live-bottom/02_timezone
deleted file mode 100755
index dad3cad..0000000
--- a/scripts/live-bottom/02_timezone
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-initramfs header
-
-. /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
diff --git a/scripts/live-bottom/02timezone b/scripts/live-bottom/02timezone
new file mode 100755
index 0000000..dad3cad
--- /dev/null
+++ b/scripts/live-bottom/02timezone
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+#set -e
+
+# initramfs-tools header
+
+PREREQ=""
+
+prereqs()
+{
+	echo "${PREREQ}"
+}
+
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+# live-initramfs header
+
+. /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
-- 
cgit v1.2.3