From 3c5036a62f7212cd7b8bd39da91f6d2c81391c6c Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 26 Feb 2020 17:09:23 +0100
Subject: [PATCH] TEST-03-USR-MOUNT: more debugging

---
 test/TEST-03-USR-MOUNT/create-root.sh | 2 +-
 test/TEST-03-USR-MOUNT/test.sh        | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/TEST-03-USR-MOUNT/create-root.sh b/test/TEST-03-USR-MOUNT/create-root.sh
index 66907e8b9..62a26c6b3 100755
--- a/test/TEST-03-USR-MOUNT/create-root.sh
+++ b/test/TEST-03-USR-MOUNT/create-root.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 # don't let udev and this script step on eachother's toes
+set -x
 for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
@@ -37,4 +38,3 @@ umount /root
 echo "dracut-root-block-created" >/dev/sda1
 sync
 poweroff -f
-
diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index 53c4a1dc5..f3d05aeb2 100755
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -118,8 +118,10 @@ test_setup() {
         -m 512M  -smp 2 -nographic -net none \
         -append "root=/dev/dracut/root rw rootfstype=btrfs quiet console=ttyS0,115200n81 selinux=0" \
         -initrd $TESTDIR/initramfs.makeroot  || return 1
-    grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.btrfs || return 1
-
+    if ! grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.btrfs; then
+        echo "Could not create root filesystem"
+        return 1
+    fi
 
     (
         export initdir=$TESTDIR/overlay
-- 
2.47.3