[SCM] live-initramfs branch, debian-next, updated. debian/1.236.2-1-6-g5ec5128

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 5ec5128982635a1189c165c2c39b8b6432be3d8b
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun May 23 13:09:20 2010 +0200

    Including mountpoints live-bottom script in main script itself.

diff --git a/scripts/live b/scripts/live
index 8996e91..4131c32 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1811,6 +1811,13 @@ mountroot ()
 		mount -n -o bind /dev "${rootmnt}/dev"
 	fi
 
+	# Move to the new root filesystem so that programs there can get at it.
+	if [ ! -d /root/live/image ]
+	then
+		mkdir -p /root/live/image
+		mount --move /live/image /root/live/image
+	fi
+
 	maybe_break live-bottom
 	log_begin_msg "Running /scripts/live-bottom\n"
 
diff --git a/scripts/live-bottom/05mountpoints b/scripts/live-bottom/05mountpoints
deleted file mode 100755
index ce151e1..0000000
--- a/scripts/live-bottom/05mountpoints
+++ /dev/null
@@ -1,36 +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 "Moving mount points"
-
-# live-initramfs script
-
-# Move to the new root filesystem so that programs there can get at it.
-if [ ! -d /root/live/image ]
-then
-	mkdir -p /root/live/image
-	mount --move /live/image /root/live/image
-fi
-
-log_end_msg

-- 
live-initramfs