Simplyfing initramfs-tools specific files within the source tree.

diff --git a/Makefile b/Makefile
index c8cf463..4aac9bc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = bin/* initramfs-tools/hooks/* initramfs-tools/scripts/live scripts/*.sh scripts/*/*
+SCRIPTS = bin/* backends/initramfs-tools/* scripts/*.sh scripts/*/*
 
 all: build
 
@@ -52,8 +52,10 @@ install:
        mkdir -p $(DESTDIR)/usr/share/live-boot
        cp bin/live-preseed bin/live-reconfigure $(DESTDIR)/usr/share/live-boot
 
-       mkdir -p $(DESTDIR)/usr/share/initramfs-tools
-       cp -r initramfs-tools/* $(DESTDIR)/usr/share/initramfs-tools
+       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
+       cp backends/initramfs-tools/live.script $(DESTDIR)/usr/share/initramfs-tools/scripts/live
 
        # Installing docs
        mkdir -p $(DESTDIR)/usr/share/doc/live-boot
@@ -87,11 +89,9 @@ uninstall:
        rm -rf $(DESTDIR)/usr/share/live-boot
 
        rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live
-       rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live*
-       rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/live
+       rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/live
 
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks > /dev/null 2>&1 || true
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top > /dev/null 2>&1 || true
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts > /dev/null 2>&1 || true
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools > /dev/null 2>&1 || true
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true

diff --git a/initramfs-tools/hooks/live b/backends/initramfs-tools/live.hook
similarity index 100%
rename from initramfs-tools/hooks/live
rename to backends/initramfs-tools/live.hook

diff --git a/initramfs-tools/scripts/live b/backends/initramfs-tools/live.script
similarity index 100%
rename from initramfs-tools/scripts/live
rename to backends/initramfs-tools/live.script