From: Harald Hoyer <harald@redhat.com>
Date: Mon, 2 Mar 2020 13:55:23 +0000 (+0100)
Subject: TEST-04-FULL-SYSTEMD: change error reporting
X-Git-Tag: 050~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3d40a4390feeffad3c50a8a12a87de197291db8;p=thirdparty%2Fdracut.git

TEST-04-FULL-SYSTEMD: change error reporting
---

diff --git a/test/TEST-04-FULL-SYSTEMD/test-init.sh b/test/TEST-04-FULL-SYSTEMD/test-init.sh
index 687522b90..80fecb950 100755
--- a/test/TEST-04-FULL-SYSTEMD/test-init.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test-init.sh
@@ -110,27 +110,23 @@ ismounted() {
 
 systemctl --failed --no-legend --no-pager > /failed
 
-if ismounted /usr && [ ! -s /failed ]; then
-    echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sdc
-fi
-
 if ! ismounted /usr; then
     echo "**************************FAILED**************************"
     echo "/usr not mounted!!"
     cat /proc/mounts
     echo "**************************FAILED**************************"
-fi
-
-journalctl --full --no-pager -o short-monotonic
+else
+    if [ -s /failed ]; then
+        echo "**************************FAILED**************************"
+        cat /failed
+        echo "**************************FAILED**************************"
 
-if [ -s /failed ]; then
-    echo "**************************FAILED**************************"
-    cat /failed
-    echo "**************************FAILED**************************"
+    else
+        echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sdc
+        echo "All OK"
+    fi
 fi
 
-ls -al /run/systemd/system
-
 export TERM=linux
 export PS1='initramfs-test:\w\$ '
 [ -f /etc/mtab ] || ln -sfn /proc/mounts /etc/mtab