Merge ~renanrodrigo/ubuntu/+source/open-iscsi:flag-disable-configure-network into ubuntu/+source/open-iscsi:ubuntu/devel

[Renan Rodrigo]

This change introduces the ISCSI_AUTO_SKIP_INITRAMFS_NETWORKING flag, which can be used in the scenario where iscsi is set to 'auto' but there is no iBFT available. This scenario happens on Oracle Cloud, because there is a single image being shipped there and some machines will boot from iscsi and some will not.

Please check the linked bug and the commit message for more information or context.

This change has been forwarded to Debian, but it's still under discussion there:
https://salsa.debian.org/linux-blocks-team/open-iscsi/-/merge_requests/21

Landing it in Ubuntu solves the problem for now. If upstream or Debian decide to deal with this in a different way, this patch can be revisited in the future.

The package is built in https://launchpad.net/~renanrodrigo/+archive/ubuntu/patch-open-iscsi-lp2098515

autopkgtest results:
- amd64: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-renanrodrigo-patch-open-iscsi-lp2098515/plucky/amd64/o/open-iscsi/20250409_160038_88faa@/log.gz
- arm64: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-renanrodrigo-patch-open-iscsi-lp2098515/plucky/arm64/o/open-iscsi/20250410_175139_a0f6b@/log.gz
- armhf (didn't actually runs anything): https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-renanrodrigo-patch-open-iscsi-lp2098515/plucky/armhf/o/open-iscsi/20250409_153147_46ed5@/log.gz
- ppc64e: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-renanrodrigo-patch-open-iscsi-lp2098515/plucky/ppc64el/o/open-iscsi/20250410_173404_eb6c5@/log.gz
- s390x: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-renanrodrigo-patch-open-iscsi-lp2098515/plucky/s390x/o/open-iscsi/20250410_173124_8fd9c@/log.gz

[Renan Rodrigo (renanrodrigo)]

After talking to @utkarsh (Ubuntu Release Team) in a side channel, we concluded that it's better to make this a 0-day SRU to plucky when released. This gives us more time to test the change and guarantees a smooth release, because open-iscsi is a package present in several Ubuntu seeds.

[Renan Rodrigo (renanrodrigo)]

I will change this to point to QQ once the development is open, then prepare SRU paperwork - no need for sponsoring right now

[Lena Voytek (lvoytek)]

LGTM, this may not be what the final change looks like when Debian incorporates it, but should still be fine as an Ubuntu delta depending on how urgently we feel the fix is needed. We'll just have to keep it in mind in case Debian makes changes on their end :)

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: lvoytek, renanrodrigo
Uploaders: lvoytek
MP auto-approved

review: Approve

[Lena Voytek (lvoytek)]

Sponsored for questing

dput ubuntu ../open-iscsi_2.1.10-3ubuntu4_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../open-iscsi_2.1.10-3ubuntu4_source.changes: Valid signature from 34B8AD7D9529E793
Checking signature on .dsc
gpg: ../open-iscsi_2.1.10-3ubuntu4.dsc: Valid signature from 34B8AD7D9529E793
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading open-iscsi_2.1.10-3ubuntu4.dsc: done.
  Uploading open-iscsi_2.1.10-3ubuntu4.debian.tar.xz: done.
  Uploading open-iscsi_2.1.10-3ubuntu4_source.buildinfo: done.
  Uploading open-iscsi_2.1.10-3ubuntu4_source.changes: done.
Successfully uploaded packages.

Unmerged commits

a611be0... by Renan Rodrigo on 2025-04-09

Update changelog

diff --git a/debian/changelog b/debian/changelog
index 630744b..fc4292f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+open-iscsi (2.1.10-3ubuntu4) plucky; urgency=medium
+
+  * d/extra/initramfs/local-top/iscsi: add a flag to skip network
+    configuration when iscsi is set to 'auto' but no iBFT data is present.
+    Thanks to Alec Warren <[e-mail]>. (LP: #2098515)
+
+ -- Renan Rodrigo <[e-mail]>  Wed, 09 Apr 2025 10:21:33 -0300
+
 open-iscsi (2.1.10-3ubuntu3) plucky; urgency=medium
 
   * d/t/{patch-image,testlib.py}: clean tests to make them work again
diff --git a/debian/extra/initramfs/local-top/iscsi b/debian/extra/initramfs/local-top/iscsi
index 24bf637..d294da9 100755
--- a/debian/extra/initramfs/local-top/iscsi
+++ b/debian/extra/initramfs/local-top/iscsi
@@ -177,12 +177,21 @@ do_iscsi_login ()
 		done
 	fi
 
-	# run configure_networking even if we have iscsi_auto, because there
-	# could be other network interfaces that need to be configured
-	# also, if we set up DHCP iBFT, we need ipconfig to run so it creates
-	# a proper /run/net-${DEVICE}.conf file that includes the DNS search
-	# domain, which we don't get in our iBFT data (see LP: #1806777)
-	configure_networking
+    # If ISCSI is set to auto and there is no IBFT device/data,
+    # then configuring ISCSI "automatically" isn't possible,
+    # so there is no point in trying to configure networking.
+    # If the opt-in cmdline option iscsi_auto_skip_initramfs_networking is set,
+    # then we skip the unnecessary call to  configure_networking.
+    if [ -n "$ISCSI_AUTO_SKIP_INITRAMFS_NETWORKING" ] && [ -n "$ISCSI_AUTO" ] && ! [ -e /sys/firmware/ibft ]; then
+        echo "No iBFT data found and cmdline option iscsi_auto_skip_initramfs_networking is set. Skipping unnecessary attempt to configure networking."
+    else
+        # run configure_networking even if we have iscsi_auto, because there
+        # could be other network interfaces that need to be configured
+        # also, if we set up DHCP iBFT, we need ipconfig to run so it creates
+        # a proper /run/net-${DEVICE}.conf file that includes the DNS search
+        # domain, which we don't get in our iBFT data (see LP: #1806777)
+        configure_networking
+    fi
 
 	if [ -n "$IBFT_DHCP_DEVICE" ]; then
 		if ! [ -e "/run/net-${DEVICE}.conf" ] ; then
@@ -316,6 +325,9 @@ parse_iscsi_ops ()
 		root=iscsi:*)
 			parse_root_param "${x##root=iscsi:}" ""
 			;;
+        iscsi_auto_skip_initramfs_networking)
+            ISCSI_AUTO_SKIP_INITRAMFS_NETWORKING=true
+            ;;
 		esac
 	done
 }