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

Imported using git-ubuntu import.

Changelog parent: 8027f4d9df

New changelog entries:
  [ Ben Howard ]
  * live-build/ubuntu-cpc/hooks/042-vagrant.binary: add serial device for
    Vagrant images (LP: #1546108).
  [ Daniel Watkins ]
  * Refactor ubuntu-cpc hooks to hard-code producing an 'ext4' rootfs, which
    is used outside of the livecd-rootfs build process (specifically for EC2
    publication).

debian/changelog

@@ -1,3 +1,16 @@
+livecd-rootfs (2.380) xenial; urgency=medium
+
+  [ Ben Howard ]
+  * live-build/ubuntu-cpc/hooks/042-vagrant.binary: add serial device for
+    Vagrant images (LP: #1546108).
+
+  [ Daniel Watkins ]
+  * Refactor ubuntu-cpc hooks to hard-code producing an 'ext4' rootfs, which
+    is used outside of the livecd-rootfs build process (specifically for EC2
+    publication).
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 22 Feb 2016 19:17:15 +0000
+
 livecd-rootfs (2.379) xenial; urgency=medium
 
   * add /var/lib/systemd/rfkill to pre-created dirs to use as writable

live-build/auto/config

@@ -103,7 +103,7 @@ add_binary_hook ()
 
 case $PROJECT in
 	ubuntu-cpc)
-		IMAGEFORMAT=plain
+		IMAGEFORMAT=ext4
 		;;
 esac
 
@@ -116,11 +116,17 @@ case $IMAGEFORMAT in
 				add_package install lupin-support
 				COMPONENTS='main restricted universe multiverse'
 				;;
+			*)
+				case $PROJECT in
+					ubuntu-cpc)
+						;;
 					*)
 						add_package live jasper
 						;;
 				esac
 				;;
+		esac
+		;;
 
 	plain)
 		OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"

live-build/ubuntu-cpc/hooks/030-root-tarball.binary

@@ -7,6 +7,9 @@ fi
 
 . /build/config/functions
 
+mkdir binary/boot/filesystem.dir
+cp -a chroot/* binary/boot/filesystem.dir
+
 setup_mountpoint binary/boot/filesystem.dir
 
 chroot binary/boot/filesystem.dir dpkg-divert --local --rename /usr/sbin/grub-probe

live-build/ubuntu-cpc/hooks/042-vagrant.binary

@@ -112,6 +112,11 @@ Vagrant.configure("2") do |config|
   config.ssh.username = "ubuntu"
   config.ssh.password = "${ubuntu_user_pass}"
   config.vm.synced_folder '.', '/vagrant', disabled: true
+
+  # Needed due to the default commandline, which expects a console.
+  config.customize [ "modifyvm", :id, "--uart1", "0x3F8", "4" ]
+  config.customize [ "modifyvm", :id, "--uartmode1", "file", "console.log" ]
+
 end
 EOF