Import patches-unapplied version 2.375 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 2ace5b787b

New changelog entries:
  [ Steve Langasek ]
  * Refactor some non-idiomatic architecture handling in
    live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot that also misidentifies
    the architecture name for armhf.
  [ Ben Howard ]
  * ubuntu-cpc: add missing net.ifnames=0 for ppc64el disk images.

debian/changelog

@@ -1,3 +1,15 @@
+livecd-rootfs (2.375) xenial; urgency=medium
+
+  [ Steve Langasek ]
+  * Refactor some non-idiomatic architecture handling in
+    live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot that also misidentifies
+    the architecture name for armhf.
+
+  [ Ben Howard ]
+  * ubuntu-cpc: add missing net.ifnames=0 for ppc64el disk images.
+
+ -- Ben Howard <ben.howard@ubuntu.com>  Thu, 04 Feb 2016 17:15:58 +0100
+
 livecd-rootfs (2.374) xenial; urgency=medium
 
   [ Michael Vogt ]

live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary

@@ -38,7 +38,7 @@ GRUB_RECORDFAIL_TIMEOUT=0
 GRUB_TIMEOUT=0
 
 # Set the default commandline
-GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk"
+GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk net.ifnames=0"
 EOF
     prep_partition="/dev/mapper${loop_device///dev/}p2"
     chroot mountpoint grub-install "${prep_partition}" \

live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot

@@ -126,30 +126,29 @@ fi
 
 #### END COMMON ARCH FUNCTIONS
 
-if [ "$arch" = "ppc64el" ]; then
-   add_serial_console hvc0
-   exit 0
-fi
-
-# ARM images are special
-if [[ "$arch" =~ (arm|arm64|aarch64) ]]; then
-
-   echo "Configuring ARM Serial Port"
-   add_serial_console ttyAMA0
-
-   echo "Image architecture is ARM. Existing vmbuilder-fixups"
-
-   exit 0
-fi
-
-if [ "$arch" = "s390x" ]; then
-    exit 0
-fi
 
-## Add ttyS0 for i386/amd64 for Trusty and newer
-if [ "$arch" = "i386" -o "$arch" = "amd64" ]; then
-   add_serial_console ttyS0
-fi
+case $arch in
+	# ARM images are special
+	armhf|arm64)
+		echo "Configuring ARM Serial Port"
+		add_serial_console ttyAMA0
+
+		echo "Image architecture is ARM. Existing vmbuilder-fixups"
+
+		exit 0
+		;;
+	## Add ttyS0 for i386/amd64 for Trusty and newer
+	i386|amd64)
+		add_serial_console ttyS0
+		;;
+	ppc64el)
+		add_serial_console hvc0
+		exit 0
+		;;
+	s390x)
+		exit 0
+		;;
+esac
 
 psuedo_grub_probe() {
    cat <<"PSUEDO_GRUB_PROBE"