iscsi/iscsiroot.sh: handle firmware in online queue
otherwise it does not get called, if no netroot is set
parent
35f40b75e4
commit
3bd3bbec31
|
@ -238,28 +238,26 @@ if [ "$netif" = "timeout" ] && all_ifaces_up; then
|
||||||
sleep 2
|
sleep 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# loop over all netroot parameter
|
if [ "$netif" = "online" ]; then
|
||||||
netroot=$(getarg netroot)
|
|
||||||
if [ $? -eq 0 ] && [ "$netroot" != "dhcp" ]; then
|
|
||||||
for nroot in $(getargs netroot); do
|
|
||||||
[ "${nroot%%:*}" = "iscsi" ] || continue
|
|
||||||
nroot="${nroot##iscsi:}"
|
|
||||||
if [ -n "$nroot" ]; then
|
|
||||||
handle_netroot "$nroot"
|
|
||||||
ret=$(($ret + $?))
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then
|
if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then
|
||||||
handle_firmware
|
handle_firmware
|
||||||
ret=$(($ret + $?))
|
ret=$?
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [ -n "$iroot" ]; then
|
# loop over all netroot parameter
|
||||||
handle_netroot "$iroot"
|
nroot=$(getarg netroot)
|
||||||
ret=$?
|
if [ $? -eq 0 ] && [ "$nroot" != "dhcp" ]; then
|
||||||
|
for nroot in $(getargs netroot); do
|
||||||
|
[ "${nroot%%:*}" = "iscsi" ] || continue
|
||||||
|
nroot="${nroot##iscsi:}"
|
||||||
|
if [ -n "$nroot" ]; then
|
||||||
|
handle_netroot "$nroot"
|
||||||
|
ret=$(($ret + $?))
|
||||||
|
fi
|
||||||
|
done
|
||||||
else
|
else
|
||||||
if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then
|
if [ -n "$iroot" ]; then
|
||||||
handle_firmware
|
handle_netroot "$iroot"
|
||||||
ret=$?
|
ret=$?
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue