test: remove hard-off test hooks hooks

These hard-off test hooks make the test shut down in a
non-graceful way.

These hooks are no longer required.

Removing these hooks would make the test run similarly
to production environments.

diff --git a/test/TEST-60-NFS/hard-off.sh b/test/TEST-60-NFS/hard-off.sh
deleted file mode 100755 (executable)
index 01acb19..0000000
--- a/test/TEST-60-NFS/hard-off.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-getargbool 0 rd.shell || poweroff -f
-getargbool 0 failme && poweroff -f

diff --git a/test/TEST-60-NFS/test.sh b/test/TEST-60-NFS/test.sh
index b184590cbae38e639d2a2918e10401b1eb6d3fa7..d9e2ea77609f602e919084e5aa771297b41246f8 100755 (executable)
--- a/test/TEST-60-NFS/test.sh
+++ b/test/TEST-60-NFS/test.sh
@@ -354,8 +354,6 @@ test_setup() {
         # shellcheck disable=SC1090
         . "$PKGLIBDIR"/dracut-init.sh
         inst_multiple poweroff shutdown
-        inst_hook shutdown-emergency 000 ./hard-off.sh
-        inst_hook emergency 000 ./hard-off.sh
         inst_simple ./client.link /etc/systemd/network/01-client.link
     )
 

diff --git a/test/TEST-61-MULTINIC/hard-off.sh b/test/TEST-61-MULTINIC/hard-off.sh
deleted file mode 100755 (executable)
index 01acb19..0000000
--- a/test/TEST-61-MULTINIC/hard-off.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-getargbool 0 rd.shell || poweroff -f
-getargbool 0 failme && poweroff -f

diff --git a/test/TEST-61-MULTINIC/test.sh b/test/TEST-61-MULTINIC/test.sh
index 4b0cda3d7b01a51875cfcdf352822e0803718b67..d0aab477e84d5675a495fa7a755270fd89a6d594 100755 (executable)
--- a/test/TEST-61-MULTINIC/test.sh
+++ b/test/TEST-61-MULTINIC/test.sh
@@ -330,8 +330,6 @@ test_setup() {
         # shellcheck disable=SC1090
         . "$PKGLIBDIR"/dracut-init.sh
         inst_multiple poweroff shutdown
-        inst_hook shutdown-emergency 000 ./hard-off.sh
-        inst_hook emergency 000 ./hard-off.sh
         inst_simple ./client-persistent-lan0.link /etc/systemd/network/01-persistent-lan0.link
         inst_simple ./client-persistent-lan1.link /etc/systemd/network/01-persistent-lan1.link
         inst_simple ./client-persistent-lan2.link /etc/systemd/network/01-persistent-lan2.link

diff --git a/test/TEST-62-BONDBRIDGEVLAN/hard-off.sh b/test/TEST-62-BONDBRIDGEVLAN/hard-off.sh
deleted file mode 100755 (executable)
index 12c3d5a..0000000
--- a/test/TEST-62-BONDBRIDGEVLAN/hard-off.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-getarg rd.shell || poweroff -f
-getarg failme && poweroff -f

diff --git a/test/TEST-62-BONDBRIDGEVLAN/test.sh b/test/TEST-62-BONDBRIDGEVLAN/test.sh
index d1152cc34f2d5c2f48cf74ec5411056a37591967..8cf96965b5cfc0250a0c6fd45be61f11c6c19b1e 100755 (executable)
--- a/test/TEST-62-BONDBRIDGEVLAN/test.sh
+++ b/test/TEST-62-BONDBRIDGEVLAN/test.sh
@@ -373,7 +373,6 @@ test_setup() {
         # shellcheck disable=SC1090
         . "$PKGLIBDIR"/dracut-init.sh
         inst_multiple poweroff shutdown
-        inst_hook emergency 000 ./hard-off.sh
         inst_simple ./client.link /etc/systemd/network/01-client.link
     )
     # Make client's dracut image

diff --git a/test/modules.d/70test/hard-off.sh b/test/modules.d/70test/hard-off.sh
deleted file mode 100755 (executable)
index cf44fb0..0000000
--- a/test/modules.d/70test/hard-off.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-getargbool 0 rd.shell || poweroff -f
-! getargbool 0 rd.break && getargbool 0 failme && poweroff -f

diff --git a/test/modules.d/70test/module-setup.sh b/test/modules.d/70test/module-setup.sh
index af4bce273196ed28ecbd5e4310b6cdb0868618fc..cd73a4802923c75760986b68b2b23750d7659903 100755 (executable)
--- a/test/modules.d/70test/module-setup.sh
+++ b/test/modules.d/70test/module-setup.sh
@@ -20,8 +20,3 @@ installkernel() {
         virtio_pci \
         virtio_scsi
 }
-
-install() {
-    inst_hook shutdown-emergency 000 "$moddir/hard-off.sh"
-    inst_hook emergency 000 "$moddir/hard-off.sh"
-}