TEST-03-USR-MOUNT: more debugging

diff --git a/test/TEST-03-USR-MOUNT/create-root.sh b/test/TEST-03-USR-MOUNT/create-root.sh
index 66907e8b97857703e7aee263d72537248bf7bcf3..62a26c6b3b5d59cee9e684708ab786ddee94fd25 100755 (executable)
--- 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 53c4a1dc50989ac17114c5bc2e4bb79c1cabf70d..f3d05aeb23bd73f59e51caa2b9c23c0662d80ef9 100755 (executable)
--- 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