From: Daniel Baumann <daniel@debian.org>
Date: Sun, 18 Apr 2010 18:41:47 +0000 (+0200)
Subject: Adding upstream version 1.110.7.
X-Git-Tag: upstream/1.110.7
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=refs%2Ftags%2Fupstream%2F1.110.7;p=live-boot-grml.git

Adding upstream version 1.110.7.
---

diff --git a/Makefile b/Makefile
index dd60498..58fa660 100644
--- a/Makefile
+++ b/Makefile
@@ -113,10 +113,10 @@ uninstall:
 update:
 	set -e; for FILE in docs/parameters.txt; \
 	do \
-		sed -i	-e 's/2007\\-11\\-12/2007\\-11\\-19/' \
-			-e 's/2007-11-12/2007-11-19/' \
-			-e 's/12.11.2007/19.11.2007/' \
-			-e 's/1.110.6/1.110.7/' \
+		sed -i	-e 's/2007\\-11\\-19/2007\\-11\\-26/' \
+			-e 's/2007-11-19/2007-11-26/' \
+			-e 's/19.11.2007/26.11.2007/' \
+			-e 's/1.110.7/1.110.8/' \
 		$$FILE; \
 	done
 
diff --git a/docs/parameters.txt b/docs/parameters.txt
index 20dd366..c9c8c91 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
 Boot Parameters for Debian Live
 -------------------------------
 
-Updated for live-initramfs 1.110.6-1 on 2007-11-12.
+Updated for live-initramfs 1.110.7-1 on 2007-11-19.
 
 These options (can be combined) work from the bootloader prompt:
 
diff --git a/scripts/live b/scripts/live
index 9fff065..80f77e9 100755
--- a/scripts/live
+++ b/scripts/live
@@ -983,6 +983,8 @@ setup_unionfs ()
 			cow_fstype=$(get_fstype "${cowprobe}")
 		else
 			[ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium"
+			cowdevice="tmpfs"
+			cow_fstype="tmpfs"
 		fi
 	elif [ -n "${NFS_COW}" ]
 	then
diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index ca83626..936eeae 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -28,23 +28,18 @@ then
 	exit 0
 fi
 
-if [ -s ${FSTAB} ]
-then
-	log_begin_msg "Not touching preexisting fstab..."
-else
-	log_begin_msg "Configuring fstab..."
-
-	cat >> ${FSTAB} <<-EOF
-	# /etc/fstab: static file system information.
-	#
-	# <file system> <mount point>   <type>  <options>       <dump>  <pass>
-	${UNIONTYPE} / ${UNIONTYPE} rw 0 0
-	tmpfs /tmp tmpfs nosuid,nodev 0 0
-	EOF
-fi
+log_begin_msg "Configuring fstab..."
 
 # live-initramfs script
 
+cat >> ${FSTAB} << EOF
+# /etc/fstab: static file system information.
+#
+# <file system> <mount point>   <type>  <options>       <dump>  <pass>
+
+${UNIONTYPE} / ${UNIONTYPE} rw 0 0
+tmpfs /tmp tmpfs nosuid,nodev 0 0
+EOF
 
 # disabled for now
 #rm -f /root/etc/rcS.d/S*checkroot.sh