|
 |
2d3fda9 |
From a128f03b305aebdce6a99a6b027c17ed58a1648e Mon Sep 17 00:00:00 2001
|
|
|
2d3fda9 |
From: Harald Hoyer <harald@redhat.com>
|
|
|
2d3fda9 |
Date: Tue, 3 Jul 2012 18:21:54 +0200
|
|
|
2d3fda9 |
Subject: [PATCH] TEST-03-USR-MOUNT: change test to use a seperate disk
|
|
|
2d3fda9 |
|
|
|
2d3fda9 |
---
|
|
|
2d3fda9 |
test/TEST-03-USR-MOUNT/create-root.sh | 14 ++++++++++++--
|
|
|
2d3fda9 |
test/TEST-03-USR-MOUNT/fstab | 2 +-
|
|
|
2d3fda9 |
test/TEST-03-USR-MOUNT/test-init.sh | 2 +-
|
|
|
2d3fda9 |
test/TEST-03-USR-MOUNT/test.sh | 8 ++++++--
|
|
|
2d3fda9 |
4 files changed, 20 insertions(+), 6 deletions(-)
|
|
|
2d3fda9 |
|
|
|
2d3fda9 |
diff --git a/test/TEST-03-USR-MOUNT/create-root.sh b/test/TEST-03-USR-MOUNT/create-root.sh
|
|
|
2d3fda9 |
index 6662bca..9a3e561 100755
|
|
|
2d3fda9 |
--- a/test/TEST-03-USR-MOUNT/create-root.sh
|
|
|
2d3fda9 |
+++ b/test/TEST-03-USR-MOUNT/create-root.sh
|
|
|
2d3fda9 |
@@ -12,13 +12,23 @@ sfdisk -C 5120 -H 2 -S 32 -L /dev/sda <
|
|
|
2d3fda9 |
,
|
|
|
2d3fda9 |
EOF
|
|
|
2d3fda9 |
|
|
|
2d3fda9 |
+sfdisk -C 5120 -H 2 -S 32 -L /dev/sdb <
|
|
|
2d3fda9 |
+,16
|
|
|
2d3fda9 |
+,
|
|
|
2d3fda9 |
+EOF
|
|
|
2d3fda9 |
+
|
|
|
2d3fda9 |
+
|
|
|
2d3fda9 |
mkfs.btrfs -L dracut /dev/sda2
|
|
|
2d3fda9 |
+mkfs.btrfs -L dracutusr /dev/sdb2
|
|
|
2d3fda9 |
btrfs device scan /dev/sda2
|
|
|
2d3fda9 |
+btrfs device scan /dev/sdb2
|
|
|
2d3fda9 |
mkdir -p /root
|
|
|
2d3fda9 |
mount -t btrfs /dev/sda2 /root
|
|
|
2d3fda9 |
-btrfs subvolume create /root/usr
|
|
|
2d3fda9 |
[ -d /root/usr ] || mkdir /root/usr
|
|
|
2d3fda9 |
-mount -t btrfs -o subvol=usr /dev/sda2 /root/usr
|
|
|
2d3fda9 |
+mount -t btrfs /dev/sdb2 /root/usr
|
|
|
2d3fda9 |
+btrfs subvolume create /root/usr/usr
|
|
|
2d3fda9 |
+umount /root/usr
|
|
|
2d3fda9 |
+mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr
|
|
|
2d3fda9 |
cp -a -t /root /source/*
|
|
|
2d3fda9 |
mkdir -p /root/run
|
|
|
2d3fda9 |
umount /root/usr
|
|
|
2d3fda9 |
diff --git a/test/TEST-03-USR-MOUNT/fstab b/test/TEST-03-USR-MOUNT/fstab
|
|
|
2d3fda9 |
index 0e0a0e0..0cc3370 100644
|
|
|
2d3fda9 |
--- a/test/TEST-03-USR-MOUNT/fstab
|
|
|
2d3fda9 |
+++ b/test/TEST-03-USR-MOUNT/fstab
|
|
|
2d3fda9 |
@@ -1,2 +1,2 @@
|
|
|
2d3fda9 |
/dev/sda2 / btrfs defaults 0 0
|
|
|
2d3fda9 |
-/dev/sda2 /usr btrfs subvol=usr,ro 0 0
|
|
|
2d3fda9 |
+/dev/sdb2 /usr btrfs subvol=usr,ro 0 0
|
|
|
2d3fda9 |
diff --git a/test/TEST-03-USR-MOUNT/test-init.sh b/test/TEST-03-USR-MOUNT/test-init.sh
|
|
|
2d3fda9 |
index 494313b..63520ab 100755
|
|
|
2d3fda9 |
--- a/test/TEST-03-USR-MOUNT/test-init.sh
|
|
|
2d3fda9 |
+++ b/test/TEST-03-USR-MOUNT/test-init.sh
|
|
|
2d3fda9 |
@@ -14,7 +14,7 @@ ismounted() {
|
|
|
2d3fda9 |
}
|
|
|
2d3fda9 |
|
|
|
2d3fda9 |
if ismounted /usr; then
|
|
|
2d3fda9 |
- echo "dracut-root-block-success" >/dev/sdb
|
|
|
2d3fda9 |
+ echo "dracut-root-block-success" >/dev/sdc
|
|
|
2d3fda9 |
fi
|
|
|
2d3fda9 |
export TERM=linux
|
|
|
2d3fda9 |
export PS1='initramfs-test:\w\$ '
|
|
|
2d3fda9 |
diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
|
|
|
2d3fda9 |
index 34a120f..d966c3c 100755
|
|
|
2d3fda9 |
--- a/test/TEST-03-USR-MOUNT/test.sh
|
|
|
2d3fda9 |
+++ b/test/TEST-03-USR-MOUNT/test.sh
|
|
|
2d3fda9 |
@@ -16,7 +16,8 @@ client_run() {
|
|
|
2d3fda9 |
dd if=/dev/zero of=$TESTDIR/result bs=1M count=1
|
|
|
2d3fda9 |
$testdir/run-qemu \
|
|
|
2d3fda9 |
-hda $TESTDIR/root.btrfs \
|
|
|
2d3fda9 |
- -hdb $TESTDIR/result \
|
|
|
2d3fda9 |
+ -hdb $TESTDIR/usr.btrfs \
|
|
|
2d3fda9 |
+ -hdc $TESTDIR/result \
|
|
|
2d3fda9 |
-m 256M -nographic \
|
|
|
2d3fda9 |
-net none -kernel /boot/vmlinuz-$KVERSION \
|
|
|
2d3fda9 |
-watchdog ib700 -watchdog-action poweroff \
|
|
|
2d3fda9 |
@@ -37,7 +38,7 @@ client_run() {
|
|
|
2d3fda9 |
}
|
|
|
2d3fda9 |
|
|
|
2d3fda9 |
test_run() {
|
|
|
2d3fda9 |
- client_run "no option specified, should fail" && return 1
|
|
|
2d3fda9 |
+ client_run "no option specified" || return 1
|
|
|
2d3fda9 |
client_run "readonly root" "ro" || return 1
|
|
|
2d3fda9 |
client_run "writeable root" "rw" || return 1
|
|
|
2d3fda9 |
return 0
|
|
|
2d3fda9 |
@@ -45,8 +46,10 @@ test_run() {
|
|
|
2d3fda9 |
|
|
|
2d3fda9 |
test_setup() {
|
|
|
2d3fda9 |
rm -f $TESTDIR/root.btrfs
|
|
|
2d3fda9 |
+ rm -f $TESTDIR/usr.btrfs
|
|
|
2d3fda9 |
# Create the blank file to use as a root filesystem
|
|
|
2d3fda9 |
dd if=/dev/null of=$TESTDIR/root.btrfs bs=1M seek=160
|
|
|
2d3fda9 |
+ dd if=/dev/null of=$TESTDIR/usr.btrfs bs=1M seek=160
|
|
|
2d3fda9 |
|
|
|
2d3fda9 |
kernel=$KVERSION
|
|
|
2d3fda9 |
# Create what will eventually be our root filesystem onto an overlay
|
|
|
2d3fda9 |
@@ -100,6 +103,7 @@ test_setup() {
|
|
|
2d3fda9 |
|
|
|
2d3fda9 |
$testdir/run-qemu \
|
|
|
2d3fda9 |
-hda $TESTDIR/root.btrfs \
|
|
|
2d3fda9 |
+ -hdb $TESTDIR/usr.btrfs \
|
|
|
2d3fda9 |
-m 256M -nographic -net none \
|
|
|
2d3fda9 |
-kernel "/boot/vmlinuz-$kernel" \
|
|
|
2d3fda9 |
-append "root=/dev/dracut/root rw rootfstype=btrfs quiet console=ttyS0,115200n81 selinux=0" \
|