kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TEST-30-ISCSI: fix test to run with new iscsi 

(cherry picked from commit 836ca3f47e)
master
Harald Hoyer 2015-08-15 13:22:44 +02:00
parent f5753e1861
commit 0a10d7fc51
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/TEST-30-ISCSI/test.sh
View File

@ -49,7 +49,7 @@ run_client() {
-net nic,macaddr=52:54:00:12:34:00,model=e1000 \
-net nic,macaddr=52:54:00:12:34:01,model=e1000 \
-net socket,connect=127.0.0.1:12330 \
-append "rw rd.auto rd.retry=20 console=ttyS0,115200n81 selinux=0 rd.debug=0 $DEBUGFAIL $*" \
-append "rw rd.auto rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 $DEBUGFAIL $*" \
-initrd $TESTDIR/initramfs.testing
if ! grep -F -m 1 -q iscsi-OK $TESTDIR/client.img; then
echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
@ -93,7 +93,7 @@ do_test_run() {
"netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \
"rd.iscsi.firmware" \
"rd.iscsi.initiator=$initiator" \
"rd.waitnet=0 rd.retry=30" \
"rd.iscsi.waitnet=0" \
|| return 1

run_client "netroot=iscsi target1 target2 rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \
@ -104,7 +104,7 @@ do_test_run() {
"netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \
"rd.iscsi.firmware" \
"rd.iscsi.initiator=$initiator" \
"rd.waitnet=0 rd.iscsi.testroute=0 rd.retry=30" \
"rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \
|| return 1

run_client "netroot=iscsi target1 target2 rd.iscsi.waitnet=0 rd.iscsi.testroute=0 default GW" \
@ -115,7 +115,7 @@ do_test_run() {
"netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \
"rd.iscsi.firmware" \
"rd.iscsi.initiator=$initiator" \
"rd.waitnet=0 rd.iscsi.testroute=0 rd.retry=30" \
"rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \
|| return 1

return 0