diff --git a/debian/changelog b/debian/changelog index b434fe39..86590520 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +livecd-rootfs (2.209.14) trusty; 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). + + -- Robert C Jennings Tue, 24 May 2017 14:08:47 -0500 + livecd-rootfs (2.209.13) trusty; urgency=medium [Adam Conrad] diff --git a/live-build/auto/config b/live-build/auto/config index 64be2cc4..a827450c 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -113,7 +113,7 @@ add_binary_hook () case $PROJECT in ubuntu-cpc) - IMAGEFORMAT=plain + IMAGEFORMAT=ext4 ;; esac diff --git a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary index eff30ec1..8856cf56 100644 --- a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary +++ b/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 diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary index 6bf40dc3..618d3f9c 100644 --- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary +++ b/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