From: Harald Hoyer Date: Fri, 16 Apr 2010 14:48:08 +0000 (+0200) Subject: TEST-12-RAID-DEG/create-root: filter MD_UUID only X-Git-Tag: 006~59 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e96d7aa33c96d84f9f38fc940388b109f34f7b8;p=thirdparty%2Fdracut-ng.git TEST-12-RAID-DEG/create-root: filter MD_UUID only --- diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh index 23f1afcd8..6a2988daa 100755 --- a/test/TEST-12-RAID-DEG/create-root.sh +++ b/test/TEST-12-RAID-DEG/create-root.sh @@ -35,7 +35,7 @@ cryptsetup luksClose /dev/mapper/dracut_crypt_test && \ mdadm /dev/md0 --fail /dev/sda2 --remove /dev/sda2 && \ { mdadm -W /dev/md0 || : ;} && \ { -/sbin/mdadm --detail --export /dev/md0 > /tmp/mduuid ; +/sbin/mdadm --detail --export /dev/md0 |grep MD_UUID > /tmp/mduuid ; . /tmp/mduuid; } && \ { diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index fb39551d1..0d78b9303 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -74,7 +74,7 @@ test_setup() { ( initdir=overlay . $basedir/dracut-functions - dracut_install sfdisk mke2fs poweroff cp umount dd + dracut_install sfdisk mke2fs poweroff cp umount dd grep inst_simple ./create-root.sh /initqueue/01create-root.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules )