From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 19 Oct 2022 00:05:57 +0000 (+0000)
Subject: test: move poweroff handling from test case to test module
X-Git-Tag: 058~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f62a9b6c95eb918d617233dedd3422aef076b68;p=thirdparty%2Fdracut.git

test: move poweroff handling from test case to test module
---

diff --git a/test/TEST-03-USR-MOUNT/hard-off.sh b/modules.d/80test/hard-off.sh
similarity index 100%
rename from test/TEST-03-USR-MOUNT/hard-off.sh
rename to modules.d/80test/hard-off.sh
diff --git a/modules.d/80test/module-setup.sh b/modules.d/80test/module-setup.sh
index 74de1b80e..96041a93d 100755
--- a/modules.d/80test/module-setup.sh
+++ b/modules.d/80test/module-setup.sh
@@ -10,4 +10,7 @@ depends() {
 }
 
 install() {
+    inst poweroff
+    inst_hook shutdown-emergency 000 "$moddir/hard-off.sh"
+    inst_hook emergency 000 "$moddir/hard-off.sh"
 }
diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index 9fbe40de5..5fffcf30a 100755
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -132,9 +132,7 @@ test_setup() {
         export initdir=$TESTDIR/overlay
         # shellcheck disable=SC1090
         . "$basedir"/dracut-init.sh
-        inst_multiple poweroff dd
-        inst_hook shutdown-emergency 000 ./hard-off.sh
-        inst_hook emergency 000 ./hard-off.sh
+        inst_multiple dd
     )
     "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \
         -a "test watchdog" \