Merge ~ddstreet/ubuntu/+source/open-iscsi:lp1806777 into ubuntu/+source/open-iscsi:ubuntu/devel

[Dan Streetman]

[Scott Moser (smoser)]

Looks good, thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index d20f76d..c0a9c53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+open-iscsi (2.0.874-5ubuntu12) disco; urgency=medium
+
+  [Scott Moser]
+  * debian/extra/initramfs.local-top: handle iSCSI iBFT DHCP to correctly
+    run ipconfig to gather all DHCP config info, including DNS search
+    domain, which iBFT can't provide.  (LP: #1806777)
+
+ -- Dan Streetman <[e-mail]>  Wed, 05 Dec 2018 11:28:12 -0500
+
 open-iscsi (2.0.874-5ubuntu11) disco; urgency=medium
 
   * debian/tests/test-open-iscsi.py: Fix called process error.
diff --git a/debian/extra/initramfs.local-top b/debian/extra/initramfs.local-top
index 93fea1d..9f3af32 100755
--- a/debian/extra/initramfs.local-top
+++ b/debian/extra/initramfs.local-top
@@ -93,6 +93,7 @@ do_iscsi_login ()
 	. /scripts/functions
 
 	udevadm settle
+	IBFT_DHCP_DEVICE=""
 
 	if [ -n "$ISCSI_AUTO" ] ; then
 		# try to auto-configure network interface based
@@ -136,7 +137,13 @@ do_iscsi_login ()
 					echo "UPTIME='${UPTIME}'"
 					echo "DHCPLEASETIME='${DHCPLEASETIME}'"
 					echo "DOMAINSEARCH=''"
-				} > "/run/net-${DEVICE}.conf"
+				} > "/run/net-${DEVICE}.conf.ibft"
+				if [ "$PROTO" != "dhcp" -a "$DHCPLEASETIME" = "0" ]; then
+					# this is static ibft configuration.
+					mv "/run/net-${DEVICE}.conf.ibft" "/run/net-${DEVICE}.conf"
+				else
+					IBFT_DHCP_DEVICE="$DEVICE"
+				fi
 				echo "${DEVICE}" > /run/initramfs/open-iscsi.interface
 				# iscsistart -N doesn't set the default gateway. Therefore,
 				# we need to add it ourselves. However, the ip command is
@@ -172,9 +179,23 @@ do_iscsi_login ()
 
 	# run configure_networking even if we have iscsi_auto, because there
 	# could be other network interfaces that need to be configured
-	# manually
+	# 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 [ -n "$IBFT_DHCP_DEVICE" ]; then
+		if ! [ -e "/run/net-${DEVICE}.conf" ] ; then
+			echo "WARN: ipconfig dhcp failed, using iSCSI iBFT config - DNS search domain may be missing at runtime" >&2
+			# We have DHCP iBFT, but ipconfig DHCP failed;
+			# so we should fallback to just using the iBFT config,
+			# though that will not include the DNS search domain
+			mv "/run/net-${DEVICE}.conf.ibft" "/run/net-${DEVICE}.conf"
+			# need to re-run configure_networking to process conf file
+			configure_networking
+		fi
+	fi
+
 	# Save network device we configured via configure_networking, but only
 	# if we didn't already get one from autoconfiguration (then we always
 	# prefer that).