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

[Daniel Baumann]

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

    Removing live-reconfigure, not used anymore.

diff --git a/Makefile b/Makefile
index 232d144..297259e 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ install:
 	cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin
 
 	mkdir -p $(DESTDIR)/usr/share/live-boot
-	cp bin/live-preseed bin/live-reconfigure $(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
diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook
index 5fc01ec..1ff2a16 100755
--- a/backends/initramfs-tools/live.hook
+++ b/backends/initramfs-tools/live.hook
@@ -58,7 +58,6 @@ cp -a /lib/live/boot.sh /lib/live/boot "${DESTDIR}/lib/live"
 mkdir -p "${DESTDIR}"/lib/live-boot
 
 # Executables
-copy_exec /usr/share/live-boot/live-reconfigure /bin
 copy_exec /usr/share/live-boot/live-preseed /bin
 
 # klibc dependencies
diff --git a/bin/live-reconfigure b/bin/live-reconfigure
deleted file mode 100755
index 16cb51d..0000000
--- a/bin/live-reconfigure
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh
-
-set -e
-
-export PATH=/usr/bin:/usr/sbin:/sbin:/bin
-
-frontend=noninteractive
-
-findcommandinroot ()
-{
-	ROOT="${1}/"
-	shift
-
-	while [ "${#}" -ge 1 ]
-	do
-		P="${PATH}"
-
-		while [ "${P}" ]
-		do
-			D=${P%%:*}
-			P=${P#*:}
-
-			if [ "${D}" = "${P}" ]
-			then
-				P=
-			fi
-
-			if [ -z "${D}" ]
-			then
-				D=.
-			fi
-
-			if [ -x "${ROOT}${D}/${1}" ]
-			then
-				echo "${D}/${1}"
-				return 0
-			fi
-		done
-
-		shift
-	done
-
-	return 1
-}
-
-runcommandinroot ()
-{
-	C=$(findcommandinroot "${1}" "${2}")
-	ROOT="${1}"
-
-	shift
-	shift
-
-	[ -n "${C}" ] && chroot "${ROOT}" "${C}" "${@}"
-}
-
-root="${1}"
-package="${2}"
-
-version=$(runcommandinroot "${root}" dpkg-query -W --showformat='${Version}' "${package}" 2>/dev/null) || version=""
-
-if [ -z "${version}" ]
-then
-	echo >&2 "${0}: package '${package}' is not installed"
-	exit 0
-fi
-
-runcommandinroot "${root}" dpkg-reconfigure -fnoninteractive --no-reload "${package}"
-
-exit 0

-- 
live-boot