Merge lp:~lamont/cloud-initramfs-tools/bug-1621615-device6 into lp:cloud-initramfs-tools

[LaMont Jones]

Eliminating the regression in initramfs-tools added a DEVICE6 variable that cloud-initramfs-dyn-netconf needs to handle.

Eliminating the regression in initramfs-tools added a DEVICE6 variable that cloud-initramfs-dyn-netconf needs to handle.

[LaMont Jones (lamont)]

Tested and confirmed to work (with 1621507). Needs to be added to zesty, and backported to yakkety/xenial.

[Scott Moser (smoser)]

One nit, other than that i think it looks good.

[lp:~lamont/cloud-initramfs-tools/bug-1621615-device6]

123. By LaMont Jones on 2016-11-02

No need for /tmp/net6-*.conf.

=== modified file 'dyn-netconf/scripts/init-bottom/cloud-initramfs-dyn-netconf'
--- dyn-netconf/scripts/init-bottom/cloud-initramfs-dyn-netconf	2016-10-05 15:36:11 +0000
+++ dyn-netconf/scripts/init-bottom/cloud-initramfs-dyn-netconf	2016-11-02 19:01:35 +0000
@@ -102,7 +102,7 @@
 
 ni_header > "$tmpf"
 seen=","
-for f in /run/net-*.conf /tmp/net-*.conf; do
+for f in /run/net-*.conf /tmp/net-*.conf /run/net6-*.conf; do
 	[ -f "$f" ] || continue
 	dev=${f#*/net-}; dev=${dev%.conf};
 	# perhaps we saw this device from /run and now we're in /tmp
@@ -112,13 +112,17 @@
 
 	DEVICE=""; PROTO=""; IPV4ADDR=""; IPV4NETMASK=""; IPV4GATEWAY="";
 	IPV4DNS0=""; IPV4DNS1=""; DNSDOMAIN=""; DOMAINSEARCH=""; filename="";
-	IPV4PROTO=""; IPV6PROTO=""; IPV6ADDR=""; IPV6NETMASK="";
+	DEVICE6=""; IPV4PROTO=""; IPV6PROTO=""; IPV6ADDR=""; IPV6NETMASK="";
 	IPV6GATEWAY=""; IPV6DNS0=""; IPV6DNS1=""; IPV6DOMAINSEARCH="";
 	. "$f"
 
 	if [ -z "$DEVICE" ]; then
-		error "WARNING: $f had no 'DEVICE' set"
-		continue
+		if [ -z "$DEVICE6" ]; then
+		    error "WARNING: $f had no 'DEVICE' or 'DEVICE6' set"
+		    continue
+		else
+		    DEVICE="$DEVICE6"
+		fi
 	fi
 	# If IPv6 is supported, we get both of these, and at least one of them
 	# is set.  If we get both, use IPv4.