test: move finished-false.sh from test case to test-makeroot module

diff --git a/test/TEST-03-USR-MOUNT/finished-false.sh b/modules.d/80test-makeroot/finished-false.sh
similarity index 100%
rename from test/TEST-03-USR-MOUNT/finished-false.sh
rename to modules.d/80test-makeroot/finished-false.sh

diff --git a/modules.d/80test-makeroot/module-setup.sh b/modules.d/80test-makeroot/module-setup.sh
index bc6193e4fa1e4e54f78faca5d2ba93c9f6b92497..7b19ef36697ce4207a674f744c78be9267056016 100755 (executable)
--- a/modules.d/80test-makeroot/module-setup.sh
+++ b/modules.d/80test-makeroot/module-setup.sh
@@ -11,4 +11,5 @@ depends() {
 
 install() {
     inst_multiple poweroff cp umount sync dd
+    inst_hook initqueue/finished 01 "$moddir/finished-false.sh"
 }

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index aea3422ef381e46d7ca21256f175116d304d4a21..bfd2ff061c7e3d79ba0731ebbe548e56480da6ba 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -90,7 +90,6 @@ test_setup() {
         . "$basedir"/dracut-init.sh
         inst_multiple sfdisk mkfs.btrfs btrfs
         inst_hook initqueue 01 ./create-root.sh
-        inst_hook initqueue/finished 01 ./finished-false.sh
     )
 
     # create an initramfs that will create the target root filesystem.