Removing live-preseed, not used anymore.

diff --git a/Makefile b/Makefile
index 297259e..79a9388 100644 (file)
--- 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 (executable)
--- 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/bin/live-preseed b/bin/live-preseed
deleted file mode 100755 (executable)
index c0933e6..0000000
--- a/bin/live-preseed
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-root="${1}"
-question="${2}"
-value="${3}"
-seen="${4}"
-
-[ "${seen}" ] || seen=true
-
-if ! (echo "SET ${question} ${value}"; echo "FSET ${question} seen ${seen}") | chroot "${1}" /usr/bin/debconf-communicate -fnoninteractive live-boot >/dev/null
-then
-
-chroot "${1}" /usr/bin/debconf-communicate -fnoninteractive live-boot >/dev/null << EOF
-REGISTER debian-installer/dummy ${question}
-SET ${question} ${value}
-FSET ${question} seen ${seen}
-EOF
-
-fi
-
-exit 0

diff --git a/debian/live-boot.install b/debian/live-boot.install
index 85134eb..bf90b05 100644 (file)
--- a/debian/live-boot.install
+++ b/debian/live-boot.install
@@ -1,3 +1,2 @@
 lib
 sbin
-usr/share/live-boot

diff --git a/scripts/boot.sh b/scripts/boot.sh
index 736e587..3579e31 100755 (executable)
--- 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