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

Proposed by Dan Streetman
Status: Merged
Merged at revision: a64d0722431a76a6acb59da0b16750a545323fc3
Proposed branch: ~ddstreet/ubuntu/+source/open-iscsi:lp1806777
Merge into: ubuntu/+source/open-iscsi:ubuntu/devel
Diff against target: 69 lines (+32/-2)
2 files modified
debian/changelog (+9/-0)
debian/extra/initramfs.local-top (+23/-2)
Reviewer Review Type Date Requested Status
Scott Moser (community) Approve
Review via email: mp+360146@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) :
Revision history for this message
Scott Moser (smoser) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index d20f76d..c0a9c53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
1open-iscsi (2.0.874-5ubuntu12) disco; urgency=medium
2
3 [Scott Moser]
4 * debian/extra/initramfs.local-top: handle iSCSI iBFT DHCP to correctly
5 run ipconfig to gather all DHCP config info, including DNS search
6 domain, which iBFT can't provide. (LP: #1806777)
7
8 -- Dan Streetman <ddstreet@canonical.com> Wed, 05 Dec 2018 11:28:12 -0500
9
1open-iscsi (2.0.874-5ubuntu11) disco; urgency=medium10open-iscsi (2.0.874-5ubuntu11) disco; urgency=medium
211
3 * debian/tests/test-open-iscsi.py: Fix called process error.12 * 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 ()
93 . /scripts/functions93 . /scripts/functions
9494
95 udevadm settle95 udevadm settle
96 IBFT_DHCP_DEVICE=""
9697
97 if [ -n "$ISCSI_AUTO" ] ; then98 if [ -n "$ISCSI_AUTO" ] ; then
98 # try to auto-configure network interface based99 # try to auto-configure network interface based
@@ -136,7 +137,13 @@ do_iscsi_login ()
136 echo "UPTIME='${UPTIME}'"137 echo "UPTIME='${UPTIME}'"
137 echo "DHCPLEASETIME='${DHCPLEASETIME}'"138 echo "DHCPLEASETIME='${DHCPLEASETIME}'"
138 echo "DOMAINSEARCH=''"139 echo "DOMAINSEARCH=''"
139 } > "/run/net-${DEVICE}.conf"140 } > "/run/net-${DEVICE}.conf.ibft"
141 if [ "$PROTO" != "dhcp" -a "$DHCPLEASETIME" = "0" ]; then
142 # this is static ibft configuration.
143 mv "/run/net-${DEVICE}.conf.ibft" "/run/net-${DEVICE}.conf"
144 else
145 IBFT_DHCP_DEVICE="$DEVICE"
146 fi
140 echo "${DEVICE}" > /run/initramfs/open-iscsi.interface147 echo "${DEVICE}" > /run/initramfs/open-iscsi.interface
141 # iscsistart -N doesn't set the default gateway. Therefore,148 # iscsistart -N doesn't set the default gateway. Therefore,
142 # we need to add it ourselves. However, the ip command is149 # we need to add it ourselves. However, the ip command is
@@ -172,9 +179,23 @@ do_iscsi_login ()
172179
173 # run configure_networking even if we have iscsi_auto, because there180 # run configure_networking even if we have iscsi_auto, because there
174 # could be other network interfaces that need to be configured181 # could be other network interfaces that need to be configured
175 # manually182 # also, if we set up DHCP iBFT, we need ipconfig to run so it creates
183 # a proper /run/net-${DEVICE}.conf file that includes the DNS search
184 # domain, which we don't get in our iBFT data (see LP: #1806777)
176 configure_networking185 configure_networking
177186
187 if [ -n "$IBFT_DHCP_DEVICE" ]; then
188 if ! [ -e "/run/net-${DEVICE}.conf" ] ; then
189 echo "WARN: ipconfig dhcp failed, using iSCSI iBFT config - DNS search domain may be missing at runtime" >&2
190 # We have DHCP iBFT, but ipconfig DHCP failed;
191 # so we should fallback to just using the iBFT config,
192 # though that will not include the DNS search domain
193 mv "/run/net-${DEVICE}.conf.ibft" "/run/net-${DEVICE}.conf"
194 # need to re-run configure_networking to process conf file
195 configure_networking
196 fi
197 fi
198
178 # Save network device we configured via configure_networking, but only199 # Save network device we configured via configure_networking, but only
179 # if we didn't already get one from autoconfiguration (then we always200 # if we didn't already get one from autoconfiguration (then we always
180 # prefer that).201 # prefer that).

Subscribers

People subscribed via source and target branches