[SCM] live-boot branch, debian-next, updated. debian/3.0_a30-1-5-gf8012d9

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit f8012d984916ff4c3eeda865bb5f551418721480
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 5 21:17:59 2012 +0200

    Removing live-preseed, not used anymore.

diff --git a/Makefile b/Makefile
index 297259e..79a9388 100644
--- a/Makefile
+++ b/Makefile
@@ -49,9 +49,6 @@ install:
 	mkdir -p $(DESTDIR)/sbin
 	cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin
 
-	mkdir -p $(DESTDIR)/usr/share/live-boot
-	cp bin/live-preseed $(DESTDIR)/usr/share/live-boot
-
 	mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks
 	cp backends/initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live
 	mkdir -p $(DESTDIR)/usr/share/initramfs-tools/scripts
@@ -86,8 +83,6 @@ uninstall:
 	rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin > /dev/null 2>&1 || true
 
-	rm -rf $(DESTDIR)/usr/share/live-boot
-
 	rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live
 	rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/live
 
diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook
index 1ff2a16..4d01777 100755
--- a/backends/initramfs-tools/live.hook
+++ b/backends/initramfs-tools/live.hook
@@ -57,9 +57,6 @@ cp -a /lib/live/boot.sh /lib/live/boot "${DESTDIR}/lib/live"
 # Directories
 mkdir -p "${DESTDIR}"/lib/live-boot
 
-# Executables
-copy_exec /usr/share/live-boot/live-preseed /bin
-
 # klibc dependencies
 for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
 do
diff --git a/scripts/boot.sh b/scripts/boot.sh
index 736e587..3579e31 100755
--- a/scripts/boot.sh
+++ b/scripts/boot.sh
@@ -630,7 +630,7 @@ mountroot ()
 		log_end_msg
 	fi
 
-	if ! [ -d "/root/usr/share/live-boot" ]
+	if ! [ -d "/lib/live/boot" ]
 	then
 		panic "A wrong rootfs was mounted."
 	fi

-- 
live-boot