diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index 4e8e2114..d13e356c 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -73,7 +73,6 @@ do_test_run() { run_client "netroot=iscsi target0"\ "root=LABEL=singleroot netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0" \ "ip=192.168.50.101::192.168.50.1:255.255.255.0:iscsi-1:ens3:off" \ - "rd.iscsi.firmware" \ "rd.iscsi.initiator=$initiator" \ || return 1 @@ -83,42 +82,9 @@ do_test_run() { "ip=192.168.51.101:::255.255.255.0::ens4:off" \ "netroot=iscsi:192.168.51.1::::iqn.2009-06.dracut:target1" \ "netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \ - "rd.iscsi.firmware" \ "rd.iscsi.initiator=$initiator" \ || return 1 -# run_client "netroot=iscsi target1 target2 rd.iscsi.waitnet=0" \ -# "root=LABEL=sysroot" \ -# "ip=192.168.50.101:::255.255.255.0::ens3:off" \ -# "ip=192.168.51.101:::255.255.255.0::ens4:off" \ -# "netroot=iscsi:192.168.51.1::::iqn.2009-06.dracut:target1" \ -# "netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \ -# "rd.iscsi.firmware" \ -# "rd.iscsi.initiator=$initiator" \ -# "rd.iscsi.waitnet=0" \ -# || return 1 - - run_client "FAILME: netroot=iscsi target1 target2 rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \ - "root=LABEL=sysroot" \ - "ip=192.168.50.101:::255.255.255.0::ens3:off" \ - "ip=192.168.51.101:::255.255.255.0::ens4:off" \ - "netroot=iscsi:192.168.51.1::::iqn.2009-06.dracut:target1" \ - "netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \ - "rd.iscsi.firmware" \ - "rd.iscsi.initiator=$initiator" \ - "rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \ - || : - - run_client "FAILME: netroot=iscsi target1 target2 rd.iscsi.waitnet=0 rd.iscsi.testroute=0 default GW" \ - "root=LABEL=sysroot" \ - "ip=192.168.50.101::192.168.50.1:255.255.255.0::ens3:off" \ - "ip=192.168.51.101::192.168.51.1:255.255.255.0::ens4:off" \ - "netroot=iscsi:192.168.51.1::::iqn.2009-06.dracut:target1" \ - "netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \ - "rd.iscsi.firmware" \ - "rd.iscsi.initiator=$initiator" \ - "rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \ - || : echo "All tests passed [OK]" return 0