diff options
| author | Harald Hoyer <harald@redhat.com> | 2009-10-09 13:57:35 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2009-10-09 13:57:35 +0200 |
| commit | ba54a4c747712845f26f3e5ff2580e424c526c9f (patch) | |
| tree | 569a48d9052b6db82225dc128bebf8fe173b7f19 | |
| parent | b26260a0b9c738b2c8f761a02bfd4e2b8325dba4 (diff) | |
test: add rdinfo
| -rwxr-xr-x | test/TEST-10-RAID/test.sh | 2 | ||||
| -rwxr-xr-x | test/TEST-20-NFS/test.sh | 2 | ||||
| -rwxr-xr-x | test/TEST-30-ISCSI/test.sh | 2 | ||||
| -rwxr-xr-x | test/TEST-40-NBD/test.sh | 2 | ||||
| -rwxr-xr-x | test/TEST-50-MULTINIC/test.sh | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index 7369cc0..154e124 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -9,7 +9,7 @@ KVERSION=${KVERSION-$(uname -r)} test_run() { $testdir/run-qemu -hda root.ext2 -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "root=/dev/dracut/root rw quiet console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL" \ + -append "root=/dev/dracut/root rw quiet rdinfo console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL" \ -initrd initramfs.testing grep -m 1 -q dracut-root-block-success root.ext2 || return 1 } diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 9e5e6c4..ad8e22d 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -46,7 +46,7 @@ client_test() { -net nic,macaddr=$mac,model=e1000 \ -net socket,mcast=230.0.0.1:1234 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "$cmdline $DEBUGFAIL rdinitdebug rdnetdebug ro quiet console=ttyS0,115200n81 selinux=0" \ + -append "$cmdline $DEBUGFAIL rdinitdebug rdinfo quiet rdnetdebug ro console=ttyS0,115200n81 selinux=0" \ -initrd initramfs.testing if [[ $? -ne 0 ]] || ! grep -m 1 -q nfs-OK client.img; then diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index 032fba4..b8ffc80 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -37,7 +37,7 @@ run_client() { -net nic,macaddr=52:54:00:12:34:00,model=e1000 \ -net socket,mcast=230.0.0.1:1235 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "root=dhcp rw quiet rdinitdebug rdnetdebug console=ttyS0,115200n81 selinux=0 rdshell $DEBUGFAIL" \ + -append "root=dhcp rw quiet rdinitdebug rdinfo rdnetdebug console=ttyS0,115200n81 selinux=0 rdshell $DEBUGFAIL" \ -initrd initramfs.testing grep -m 1 -q iscsi-OK client.img || return 1 } diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index b05441d..8b5cd8d 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -50,7 +50,7 @@ client_test() { -net nic,macaddr=$mac,model=e1000 \ -net socket,mcast=230.0.0.1:1236 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "$cmdline $DEBUGFAIL rdinitdebug rdnetdebug ro quiet console=ttyS0,115200n81 selinux=0" \ + -append "$cmdline $DEBUGFAIL rdinitdebug rdinfo rdnetdebug ro quiet console=ttyS0,115200n81 selinux=0" \ -initrd initramfs.testing if [[ $? -ne 0 ]] || ! grep -m 1 -q nbd-OK flag.img; then diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index f74370a..252d569 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -15,7 +15,7 @@ run_server() { -net socket,mcast=230.0.0.1:1234 \ -serial udp:127.0.0.1:9999 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "selinux=0 root=/dev/sda rdinitdebug rdnetdebug rw quiet console=ttyS0,115200n81" \ + -append "selinux=0 root=/dev/sda rdinitdebug rdinfo rdnetdebug rw quiet console=ttyS0,115200n81" \ -initrd initramfs.server -pidfile server.pid -daemonize || return 1 sudo chmod 644 server.pid || return 1 @@ -48,7 +48,7 @@ client_test() { -net nic,macaddr=52:54:00:12:34:$mac3,model=e1000 \ -net socket,mcast=230.0.0.1:1234 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "$cmdline $DEBUGFAIL ro quiet console=ttyS0,115200n81 selinux=0 rdshell rdcopystate" \ + -append "$cmdline $DEBUGFAIL rdinitdebug rdinfo rdnetdebug ro quiet console=ttyS0,115200n81 selinux=0 rdshell rdcopystate" \ -initrd initramfs.testing if [[ $? -ne 0 ]] || ! grep -m 1 -q OK client.img; then |