|
 |
712866 |
From 271a64bfd115897f5c89d18b9a58ed0ecf401866 Mon Sep 17 00:00:00 2001
|
|
|
712866 |
From: Harald Hoyer <harald@redhat.com>
|
|
|
712866 |
Date: Thu, 30 Jun 2016 16:36:29 +0200
|
|
|
712866 |
Subject: [PATCH] TEST-13-ENC-RAID-LVM: add rd.device.timeout=40
|
|
|
712866 |
|
|
|
712866 |
---
|
|
|
712866 |
test/TEST-13-ENC-RAID-LVM/test.sh | 6 +++---
|
|
|
712866 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
712866 |
|
|
|
712866 |
diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
|
|
|
5c6c2a |
index 7f75b32d..94801e47 100755
|
|
|
712866 |
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
|
|
|
712866 |
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
|
|
|
712866 |
@@ -19,7 +19,7 @@ test_run() {
|
|
|
712866 |
-hdb $TESTDIR/check-success.img \
|
|
|
712866 |
-m 256M -smp 2 -nographic \
|
|
|
712866 |
-net none -kernel /boot/vmlinuz-$KVERSION \
|
|
|
712866 |
- -append "root=/dev/dracut/root rw rd.auto rd.retry=20 console=ttyS0,115200n81 selinux=0 rd.debug rootwait $LUKSARGS $DEBUGFAIL" \
|
|
|
712866 |
+ -append "root=/dev/dracut/root rw rd.auto rd.retry=20 console=ttyS0,115200n81 selinux=0 $LUKSARGS rd.device.timeout=40 $DEBUGFAIL" \
|
|
|
712866 |
-initrd $TESTDIR/initramfs.testing
|
|
|
712866 |
grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
|
|
|
712866 |
echo "CLIENT TEST END: [OK]"
|
|
|
712866 |
@@ -32,7 +32,7 @@ test_run() {
|
|
|
712866 |
-hdb $TESTDIR/check-success.img \
|
|
|
712866 |
-m 256M -smp 2 -nographic \
|
|
|
712866 |
-net none -kernel /boot/vmlinuz-$KVERSION \
|
|
|
712866 |
- -append "root=/dev/dracut/root rw quiet rd.auto rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
|
|
|
712866 |
+ -append "root=/dev/dracut/root rw quiet rd.auto rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.device.timeout=40 $DEBUGFAIL" \
|
|
|
712866 |
-initrd $TESTDIR/initramfs.testing
|
|
|
712866 |
grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
|
|
|
712866 |
echo "CLIENT TEST END: [OK]"
|
|
|
712866 |
@@ -45,7 +45,7 @@ test_run() {
|
|
|
712866 |
-hdb $TESTDIR/check-success.img \
|
|
|
712866 |
-m 256M -smp 2 -nographic \
|
|
|
712866 |
-net none -kernel /boot/vmlinuz-$KVERSION \
|
|
|
712866 |
- -append "root=/dev/dracut/root rw quiet rd.auto rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL rd.luks.uuid=failme" \
|
|
|
712866 |
+ -append "root=/dev/dracut/root rw quiet rd.auto rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.luks.uuid=failme rd.device.timeout=40 $DEBUGFAIL" \
|
|
|
712866 |
-initrd $TESTDIR/initramfs.testing
|
|
|
712866 |
grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img && return 1
|
|
|
712866 |
echo "CLIENT TEST END: [OK]"
|