Reorganizing components in source tree.

diff --git a/Makefile b/Makefile
index 28709cc..8a78928 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = backend/*/* frontend/* scripts/*/*-*
+SCRIPTS = backend/*/* frontend/* components/*
 
 all: build
 
@@ -41,9 +41,9 @@ build:
        @echo "Nothing to build."
 
 install:
-       # Installing scripts
+       # Installing components
        mkdir -p $(DESTDIR)/lib/live
-       cp scripts/boot/* $(DESTDIR)/lib/live
+       cp components/* $(DESTDIR)/lib/live
 
        # Installing executables
        mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks

diff --git a/scripts/boot/0010-debug b/components/0010-debug
similarity index 100%
rename from scripts/boot/0010-debug
rename to components/0010-debug

diff --git a/scripts/boot/0020-read-only b/components/0020-read-only
similarity index 100%
rename from scripts/boot/0020-read-only
rename to components/0020-read-only

diff --git a/scripts/boot/0030-verify-checksums b/components/0030-verify-checksums
similarity index 100%
rename from scripts/boot/0030-verify-checksums
rename to components/0030-verify-checksums

diff --git a/scripts/boot/3020-swapon b/components/3020-swapon
similarity index 100%
rename from scripts/boot/3020-swapon
rename to components/3020-swapon

diff --git a/scripts/boot/9990-aaa-fixme.sh b/components/9990-aaa-fixme.sh
similarity index 100%
rename from scripts/boot/9990-aaa-fixme.sh
rename to components/9990-aaa-fixme.sh

diff --git a/scripts/boot/9990-cmdline-old b/components/9990-cmdline-old
similarity index 100%
rename from scripts/boot/9990-cmdline-old
rename to components/9990-cmdline-old

diff --git a/scripts/boot/9990-fstab.sh b/components/9990-fstab.sh
similarity index 100%
rename from scripts/boot/9990-fstab.sh
rename to components/9990-fstab.sh

diff --git a/scripts/boot/9990-initramfs-tools.sh b/components/9990-initramfs-tools.sh
similarity index 100%
rename from scripts/boot/9990-initramfs-tools.sh
rename to components/9990-initramfs-tools.sh

diff --git a/scripts/boot/9990-main.sh b/components/9990-main.sh
similarity index 100%
rename from scripts/boot/9990-main.sh
rename to components/9990-main.sh

diff --git a/scripts/boot/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
similarity index 100%
rename from scripts/boot/9990-misc-helpers.sh
rename to components/9990-misc-helpers.sh

diff --git a/scripts/boot/9990-mount-cifs.sh b/components/9990-mount-cifs.sh
similarity index 100%
rename from scripts/boot/9990-mount-cifs.sh
rename to components/9990-mount-cifs.sh

diff --git a/scripts/boot/9990-mount-http.sh b/components/9990-mount-http.sh
similarity index 100%
rename from scripts/boot/9990-mount-http.sh
rename to components/9990-mount-http.sh

diff --git a/scripts/boot/9990-mount-iscsi.sh b/components/9990-mount-iscsi.sh
similarity index 100%
rename from scripts/boot/9990-mount-iscsi.sh
rename to components/9990-mount-iscsi.sh

diff --git a/scripts/boot/9990-mount-nfs.sh b/components/9990-mount-nfs.sh
similarity index 100%
rename from scripts/boot/9990-mount-nfs.sh
rename to components/9990-mount-nfs.sh

diff --git a/scripts/boot/9990-netbase.sh b/components/9990-netbase.sh
similarity index 100%
rename from scripts/boot/9990-netbase.sh
rename to components/9990-netbase.sh

diff --git a/scripts/boot/9990-netboot.sh b/components/9990-netboot.sh
similarity index 100%
rename from scripts/boot/9990-netboot.sh
rename to components/9990-netboot.sh

diff --git a/scripts/boot/9990-networking.sh b/components/9990-networking.sh
similarity index 100%
rename from scripts/boot/9990-networking.sh
rename to components/9990-networking.sh

diff --git a/scripts/boot/9990-overlay.sh b/components/9990-overlay.sh
similarity index 100%
rename from scripts/boot/9990-overlay.sh
rename to components/9990-overlay.sh

diff --git a/scripts/boot/9990-select-eth-device.sh b/components/9990-select-eth-device.sh
similarity index 100%
rename from scripts/boot/9990-select-eth-device.sh
rename to components/9990-select-eth-device.sh

diff --git a/scripts/boot/9990-toram-todisk.sh b/components/9990-toram-todisk.sh
similarity index 100%
rename from scripts/boot/9990-toram-todisk.sh
rename to components/9990-toram-todisk.sh

diff --git a/debian/rules b/debian/rules
index ba9bb63..84e3394 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,6 @@ override_dh_auto_install:
 
        # Removing useless files
        rm -f debian/tmp/usr/share/doc/live-boot/COPYING
-       rm -f debian/lib/live/boot/FIXME
 
        # live-boot-initramfs-tools
        mkdir -p debian/live-boot-initramfs-tools/usr/share

diff --git a/scripts/boot/FIXME b/scripts/boot/FIXME
deleted file mode 100644 (file)
index be8bb32..0000000
--- a/scripts/boot/FIXME
+++ /dev/null
@@ -1,28 +0,0 @@
-Note
-----
-
-live-boot is moving from a monolithic script into a proper
-plugin architecture for better maintenance and customization.
-
-Additionally, this will allow us to abstract initramfs-tools
-integration to also support other initrd generators, such as
-dracut.
-
-Unfortunately, from a developers point of view, we could not
-finish this in time for wheezy, but we will finish this for
-jessie. Please excuse the sorry state of the 9990-* scripts.
-From a users point of view, it doesn't matter at all though.
-
-
-Scripts overview
-----------------
-
-0xxx   live-boot internals
-
-1xxx   find and mount rootfs
-
-2xxx   find and mount persistence
-
-3xxx   anything after that involves read or write access to the rootfs
-
-9xxx   FIXME