Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for booting from iSCSI offload with bnx2i (bsc#1228086) (SLFO) #396

Merged
merged 3 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions man/dracut.cmdline.7.asc
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,14 @@ iscsistart -b --param node.session.timeo.replacement_timeout=30
**rd.iscsi.testroute=0**:
Turn off checking, if the route to the iSCSI target IP is possible before trying to login.

**rd.iscsi.transport=__<transport_name>__**::
Set the iSCSI transport name (see man:iscsiadm[8,external]). iSCSI offload
transports like **bnx2i** don't need the network to be up in order to bring
up iSCSI connections. This parameter indicates that network setup can be
skipped in the initramfs, which makes booting with iSCSI offload cards
faster and more reliable. This parameter currently only has an effect for
_<transport_name>=bnx2i_.

FCoE
~~~~
**rd.fcoe=0**::
Expand Down
1 change: 0 additions & 1 deletion modules.d/95iscsi/iscsiroot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ handle_firmware() {
if [ "$retry" -lt "$ifaces" ]; then
retry=$((retry + 1))
echo $retry > /tmp/session-retry
return 1
else
rm /tmp/session-retry
fi
Expand Down
1 change: 1 addition & 0 deletions modules.d/95iscsi/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ install_ibft() {
echo -n "rd.iscsi.ibft=1 "
fi
echo -n "rd.iscsi.firmware=1 "
[ -z "$ibft_mod" ] || echo -n "rd.iscsi.transport=$ibft_mod "
fi
done
}
Expand Down
3 changes: 2 additions & 1 deletion modules.d/95iscsi/parse-iscsiroot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ if [ -z "$netroot" ]; then
fi
[ -z "$iscsiroot" ] && iscsiroot=$(getarg iscsiroot=)
[ -z "$iscsi_firmware" ] && getargbool 0 rd.iscsi.firmware -y iscsi_firmware && iscsi_firmware="1"
[ -z "$iscsi_transport" ] && iscsi_transport=$(getarg rd.iscsi.transport=)

[ -n "$iscsiroot" ] && [ -n "$iscsi_firmware" ] && die "Mixing iscsiroot and iscsi_firmware is dangerous"

Expand Down Expand Up @@ -79,7 +80,7 @@ fi
# iscsi_firmware does not need argument checking
if [ -n "$iscsi_firmware" ]; then
if [ "$root" != "dhcp" ] && [ "$netroot" != "dhcp" ]; then
[ -z "$netroot" ] && netroot=iscsi:
[ -z "$netroot" ] && [ "$iscsi_transport" != bnx2i ] && netroot=iscsi:
fi
modprobe -b -q iscsi_boot_sysfs 2> /dev/null
modprobe -b -q iscsi_ibft
Expand Down
3 changes: 3 additions & 0 deletions suse/README.susemaint
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ branch. Currently, these active maintenance branches are:
- SLE-15-SP5_Update -> SLE 15 SP5 (based on SUSE/055 plus some specific patches)
- SLE-15-SP6_Update -> SLE 15 SP6
- SL-Micro-6.0_Update -> SL Micro 6.0
- SL-Micro-6.1_Update -> SL Micro 6.1
- SLFO_Main -> SUSE Linux Framework One
- SUSE/059 -> Tumbleweed

Expand Down Expand Up @@ -389,3 +390,5 @@ ad36b61e fix(dracut.sh): omit compressed kernel modules from find searching exec
bfa00c2a fix(pcsc): add libpcsclite_real.so.*
0df92885 fix(systemd-tmpfiles): copy 20-systemd-stub.conf into the initrd
c79fc8fd fix(dracut): rework timeout for devices added via --mount and --add-device
cc2c48a0 fix(iscsi): don't require network setup for bnx2i
f30cf46e fix(iscsi): attempt iSCSI login before all interfaces are up
Loading