diff -Nru initramfs-tools-0.125ubuntu7/debian/changelog initramfs-tools-0.125ubuntu8/debian/changelog
--- initramfs-tools-0.125ubuntu7/debian/changelog	2016-10-17 21:05:49.000000000 +0000
+++ initramfs-tools-0.125ubuntu8/debian/changelog	2016-11-03 22:03:25.000000000 +0000
@@ -1,3 +1,14 @@
+initramfs-tools (0.125ubuntu8) zesty; urgency=medium
+
+  [ LaMont Jones ]
+  * Only source ipv4 config in configure_networking() if it exists.
+
+  [ Mathieu Trudel-Lapierre ]
+  * init: hey, we also need to actually will in IP6 with what someone passes
+    at the command-line in ip6=.
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Thu, 03 Nov 2016 16:03:25 -0600
+
 initramfs-tools (0.125ubuntu7) zesty; urgency=medium
 
   * scripts/functions: for configure_networking:
diff -Nru initramfs-tools-0.125ubuntu7/init initramfs-tools-0.125ubuntu8/init
--- initramfs-tools-0.125ubuntu7/init	2016-08-26 10:52:28.000000000 +0000
+++ initramfs-tools-0.125ubuntu8/init	2016-10-27 20:36:49.000000000 +0000
@@ -47,6 +47,7 @@
 export ROOTFLAGS=
 export ROOTFSTYPE=
 export IP=
+export IP6=
 export BOOT=
 export BOOTIF=
 export UBIMTD=
@@ -128,6 +129,9 @@
 	ip=*)
 		IP="${x#ip=}"
 		;;
+	ip6=*)
+		IP6="${x#ip6=}"
+		;;
 	boot=*)
 		BOOT=${x#boot=}
 		;;
diff -Nru initramfs-tools-0.125ubuntu7/scripts/functions initramfs-tools-0.125ubuntu8/scripts/functions
--- initramfs-tools-0.125ubuntu7/scripts/functions	2016-10-17 21:05:49.000000000 +0000
+++ initramfs-tools-0.125ubuntu8/scripts/functions	2016-11-03 22:03:25.000000000 +0000
@@ -398,15 +398,16 @@
 	done
 
 	# IPv4/ipconfig only...
-	# source ipconfig output
-	if [ -n "${DEVICE}" ]; then
-		# source specific bootdevice
-		. /run/net-${DEVICE}.conf
-	else
-		# source any interface...
-		# ipconfig should have quit after first response
-		. /run/net-*.conf
-	fi
+	# source ipconfig output for either $DEVICE or the first one.
+	# If the user is booting with only IPv6, then DEVICE may be set,
+	# but no IPv4 conf files exist.
+	for conf in /run/net-${DEVICE}.conf /run/net-*.conf; do
+		if [ -e "${conf}" ]; then
+			# source specific bootdevice
+			. ${conf}
+			break
+		fi
+	done
 }
 
 # Wait for queued kernel/udev events