test(USR-MOUNT): use the same btrfs drive for both root and /usr

Use btrfs to its fullest capabilities and create a subvolume for
/usr instead of a separate drive.

diff --git a/test/TEST-11-USR-MOUNT/create-root.sh b/test/TEST-11-USR-MOUNT/create-root.sh
index c92ad634073ccc280dbefa2a01d2cb36417a5c70..09a7bd828f1f14e81340a775914339ae26d711a5 100755 (executable)
--- a/test/TEST-11-USR-MOUNT/create-root.sh
+++ b/test/TEST-11-USR-MOUNT/create-root.sh
@@ -5,21 +5,13 @@ set -e
 
 modprobe btrfs || :
 mkfs.btrfs -q -L dracut /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root
-mkfs.btrfs -q -L dracutusr /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_usr
 btrfs device scan /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root
-btrfs device scan /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_usr
 mkdir -p /root
 mount -t btrfs /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root /root
-[ -d /root/usr ] || mkdir -p /root/usr
-mount -t btrfs /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_usr /root/usr
-btrfs subvolume create /root/usr/usr
-umount /root/usr
-mount -t btrfs -o subvol=usr /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_usr /root/usr
+btrfs subvolume create /root/usr
 cp -a -t /root /source/*
 mkdir -p /root/run
-btrfs filesystem sync /root/usr
 btrfs filesystem sync /root
-umount /root/usr
 umount /root
 echo "dracut-root-block-created" | dd oflag=direct,dsync of=/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_marker status=none
 poweroff -f

diff --git a/test/TEST-11-USR-MOUNT/fstab b/test/TEST-11-USR-MOUNT/fstab
index 114f94597865f3fdc0f5ce78ff57882802eb9ed4..5e60080644225fbc737586c9937754b6b8b475f5 100644 (file)
--- a/test/TEST-11-USR-MOUNT/fstab
+++ b/test/TEST-11-USR-MOUNT/fstab
@@ -1,2 +1,2 @@
 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root  /                       btrfs   defaults         0 0
-/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_usr   /usr                    btrfs   subvol=usr,ro    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 2eb9a55f4afe4d9cabda0f73fe3193d0d2445582..ce5dbbcf91a80ab2f13e16684a01f6c538d5e6ca 100755 (executable)
--- a/test/TEST-11-USR-MOUNT/test.sh
+++ b/test/TEST-11-USR-MOUNT/test.sh
@@ -25,7 +25,6 @@ client_run() {
     declare -i disk_index=0
     qemu_add_drive disk_index disk_args "$TESTDIR"/marker.img marker
     qemu_add_drive disk_index disk_args "$TESTDIR"/root.btrfs root
-    qemu_add_drive disk_index disk_args "$TESTDIR"/usr.btrfs usr
 
     test_marker_reset
     "$testdir"/run-qemu \
@@ -69,7 +68,6 @@ test_setup() {
     declare -i disk_index=0
     qemu_add_drive disk_index disk_args "$TESTDIR"/marker.img marker 1
     qemu_add_drive disk_index disk_args "$TESTDIR"/root.btrfs root 1
-    qemu_add_drive disk_index disk_args "$TESTDIR"/usr.btrfs usr 1
 
     # Invoke KVM and/or QEMU to actually create the target filesystem.
     "$testdir"/run-qemu \