test(USR-MOUNT): improve readability by removing separate fstab file

Let's test dracut's --mount command line option.

diff --git a/test/TEST-11-USR-MOUNT/fstab b/test/TEST-11-USR-MOUNT/fstab
deleted file mode 100644 (file)
index 3a6a08e..0000000
--- a/test/TEST-11-USR-MOUNT/fstab
+++ /dev/null
@@ -1 +0,0 @@
-/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root  /usr                    btrfs   subvol=usr,ro    0 0

diff --git a/test/TEST-11-USR-MOUNT/test.sh b/test/TEST-11-USR-MOUNT/test.sh
index ce5dbbcf91a80ab2f13e16684a01f6c538d5e6ca..1cf2a724ddaf7d03ed772868bbbe70e96b2fa9dc 100755 (executable)
--- a/test/TEST-11-USR-MOUNT/test.sh
+++ b/test/TEST-11-USR-MOUNT/test.sh
@@ -49,7 +49,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     "$DRACUT" -N --keep --tmpdir "$TESTDIR" \
         --add-confdir test-root \
-        -i ./fstab /etc/fstab \
+        --mount "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root /usr btrfs subvol=usr,ro" \
         -f "$TESTDIR"/initramfs.root
     mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.*