Merge ~mwhudson/ubuntu/+source/initramfs-tools:lp-1924794 into ubuntu/+source/initramfs-tools:ubuntu/devel

[Michael Hudson-Doyle]

scripts/functions: Fix the fix for bug #1880735, fixing setting up vlans from the kernel commandline. LP: #1924794

diff --git a/debian/changelog b/debian/changelog
index c5bb37b..03d0cf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+initramfs-tools (0.139ubuntu4) UNRELEASED; urgency=medium
+
+  * scripts/functions: Fix the fix for bug #1880735, fixing setting up vlans
+    from the kernel commandline. LP: #1924794 
+
+ -- Michael Hudson-Doyle <[e-mail]>  Thu, 29 Apr 2021 14:15:52 +1200
+
 initramfs-tools (0.139ubuntu3) hirsute; urgency=medium
 
   * hooks/fsck: always include fsck binaries irrespective of PASSNO value,
diff --git a/scripts/functions b/scripts/functions
index 5564588..2bd2623 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -310,12 +310,17 @@ configure_networking()
 
 	for v in $VLAN; do
 		VLAN_LINK="$VLAN_LINK ${v##*:}"
+                VLAN_NAMES="$VLAN_NAMES ${v%:*}"
 	done
 
 	# activate non-autoconfigured s390x devices
 	for dev in $DEVICE $DEVICE6 $IP6 $VLAN_LINK; do
-		# skip $DEVICE which is processed in $VLAN_LINK
-		echo "${VLAN}" | grep -q "${dev}" && continue
+		# do not chzdev $dev if it is a not-yet-created vlan interface
+                for vlan_name in $VLAN_NAMES; do
+		        if [ $dev = $vlan_name ]; then
+                                continue 2
+                        fi
+                done
 		case ${dev} in
 		enc*)
 			zdev=${dev#enc}