diff options
| author | Harald Hoyer <harald@redhat.com> | 2009-09-21 17:44:14 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2009-09-21 17:44:14 +0200 |
| commit | 8eb16b08272894fed97472a1caf24b84d84db8d5 (patch) | |
| tree | 2aba5a363212533780d48449a17dec6c8eba15b0 /test/TEST-12-RAID-DEG/test.sh | |
| parent | fc1abcfa1f65e84cd00ef617937c50e0e5847710 (diff) | |
| download | dracut-8eb16b08272894fed97472a1caf24b84d84db8d5.tar.gz dracut-8eb16b08272894fed97472a1caf24b84d84db8d5.tar.bz2 dracut-8eb16b08272894fed97472a1caf24b84d84db8d5.zip | |
selinux: bail out if policy could not be loaded and selinux=0 not
specified
Diffstat (limited to 'test/TEST-12-RAID-DEG/test.sh')
| -rwxr-xr-x | test/TEST-12-RAID-DEG/test.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index 25c96341..43592532 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -10,7 +10,7 @@ client_run() { echo "CLIENT TEST START: $@" $testdir/run-qemu -hda root.ext2 -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "$@ root=LABEL=root rw quiet rdinfo console=ttyS0,115200n81 rdshell $DEBUGFAIL " \ + -append "$@ root=LABEL=root rw quiet rdinfo console=ttyS0,115200n81 selinux=0 rdshell $DEBUGFAIL " \ -initrd initramfs.testing if ! grep -m 1 -q dracut-root-block-success root.ext2; then echo "CLIENT TEST END: $@ [FAIL]" @@ -87,7 +87,7 @@ test_setup() { # Invoke KVM and/or QEMU to actually create the target filesystem. $testdir/run-qemu -hda root.ext2 -m 256M -nographic -net none \ -kernel "/boot/vmlinuz-$kernel" \ - -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81" \ + -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ -initrd initramfs.makeroot || return 1 grep -m 1 -q dracut-root-block-created root.ext2 || return 1 eval $(grep --binary-files=text -m 1 MD_UUID root.ext2) |