diff options
| author | Harald Hoyer <harald@redhat.com> | 2012-09-27 14:05:50 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2012-09-27 14:05:50 +0200 |
| commit | e064127729af69c5147a0e91eb9147124340004d (patch) | |
| tree | 4eb6279df780ab96ddf01d033a0e5a61ef2d9cc2 /test/TEST-12-RAID-DEG | |
| parent | 103281f3b65868e8071f9eca6c43c3c4f88e1a5d (diff) | |
| download | dracut-e064127729af69c5147a0e91eb9147124340004d.tar.gz dracut-e064127729af69c5147a0e91eb9147124340004d.tar.bz2 dracut-e064127729af69c5147a0e91eb9147124340004d.zip | |
add "rd.auto" parameter and switch off automatic assembly
No automatic assembly is done anymore by default. You will have to
specify exactly what devices to assemble
("rd.md.uuid=" "rd.luks.uuid" ...)
or use "rd.auto=1" or "rd.auto" on the kernel command line.
For big servers with thousands of disks we don't want to assemble
everything by default (error prone, slow).
Diffstat (limited to 'test/TEST-12-RAID-DEG')
| -rwxr-xr-x | test/TEST-12-RAID-DEG/test.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index 558e3b0e..641b8cad 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -32,18 +32,21 @@ client_run() { test_run() { eval $(grep --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) echo "MD_UUID=$MD_UUID" + read LUKS_UUID < $TESTDIR/luksuuid - client_run || return 1 + client_run failme && return 1 + client_run rd.auto || return 1 - client_run rd.md.uuid=$MD_UUID rd.md.conf=0 || return 1 + client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.md.conf=0 rd.lvm.vg=dracut || return 1 - client_run rd.md.uuid=failme rd.md.conf=0 failme && return 1 + client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=failme rd.md.conf=0 rd.lvm.vg=dracut failme && return 1 - client_run rd.lvm=0 failme && return 1 - client_run rd.lvm.vg=failme failme && return 1 - client_run rd.lvm.vg=dracut || return 1 - client_run rd.lvm.lv=dracut/failme failme && return 1 - client_run rd.lvm.lv=dracut/root || return 1 + client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.lvm=0 failme && return 1 + client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.lvm=0 rd.auto=1 failme && return 1 + client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.lvm.vg=failme failme && return 1 + client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.lvm.vg=dracut || return 1 + client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.lvm.lv=dracut/failme failme && return 1 + client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.lvm.lv=dracut/root || return 1 return 0 } @@ -107,6 +110,7 @@ test_setup() { grep -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 eval $(grep --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) eval $(grep -a -m 1 ID_FS_UUID $TESTDIR/root.ext2) + echo $ID_FS_UUID > $TESTDIR/luksuuid ( export initdir=$TESTDIR/overlay |