From: Harald Hoyer <harald@redhat.com>
Date: Mon, 26 Apr 2021 10:40:52 +0000 (+0200)
Subject: test: don't fail on modprobe btrfs in create-root.sh
X-Git-Tag: 054~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b92af86bd572cc164ee951a147d4b12e363d560e;p=thirdparty%2Fdracut.git

test: don't fail on modprobe btrfs in create-root.sh
---

diff --git a/test/TEST-03-USR-MOUNT/create-root.sh b/test/TEST-03-USR-MOUNT/create-root.sh
index 90490f80b..411fa996a 100755
--- a/test/TEST-03-USR-MOUNT/create-root.sh
+++ b/test/TEST-03-USR-MOUNT/create-root.sh
@@ -11,7 +11,7 @@ udevadm control --reload
 set -e
 
 udevadm settle
-modprobe btrfs
+modprobe btrfs || :
 mkfs.btrfs -L dracut /dev/disk/by-id/ata-disk_root
 mkfs.btrfs -L dracutusr /dev/disk/by-id/ata-disk_usr
 btrfs device scan /dev/disk/by-id/ata-disk_root
diff --git a/test/TEST-04-FULL-SYSTEMD/create-root.sh b/test/TEST-04-FULL-SYSTEMD/create-root.sh
index 90490f80b..411fa996a 100755
--- a/test/TEST-04-FULL-SYSTEMD/create-root.sh
+++ b/test/TEST-04-FULL-SYSTEMD/create-root.sh
@@ -11,7 +11,7 @@ udevadm control --reload
 set -e
 
 udevadm settle
-modprobe btrfs
+modprobe btrfs || :
 mkfs.btrfs -L dracut /dev/disk/by-id/ata-disk_root
 mkfs.btrfs -L dracutusr /dev/disk/by-id/ata-disk_usr
 btrfs device scan /dev/disk/by-id/ata-disk_root
diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-15-BTRFSRAID/create-root.sh
index b8560ad81..075deac37 100755
--- a/test/TEST-15-BTRFSRAID/create-root.sh
+++ b/test/TEST-15-BTRFSRAID/create-root.sh
@@ -6,7 +6,7 @@ trap 'poweroff -f' EXIT
 for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     : > "/etc/udev/rules.d/$x"
 done
-modprobe btrfs
+modprobe btrfs || :
 udevadm control --reload
 udevadm settle