Merge lp:~utlemming/livecd-rootfs/v380 into lp:livecd-rootfs

[Ben Howard]

Fix for Vagrant Images (LP: #1546108).

[Dimitri John Ledkov (xnox)]

¯\_(ツ)_/¯

review: Approve

[Kevin W Monroe (kwmonroe)]

I don't think this will work, at least not on OSX with vagrant-1.8.1. Attempting to 'vagrant up <foo>' based on this box results in:

-----
There are errors in the configuration of this machine. Please fix
the following errors and try again:

Vagrant:
* Unknown configuration section 'customize'.
-----

I altered your patch to 042-vagrant.binary like this:

http://paste.ubuntu.com/15174464/

And it worked for me. Just my $0.02.

[Kevin W Monroe (kwmonroe)]

I should have explained my changes a bit better.. I think 'customize' is a provider-specific thing, so config.customize won't work. The only refs I can find to customize from vagrantup.com are from the "VBOXMANAGE CUSTOMIZATIONS" section here [0], which call '.customize' on a config.vm.provider object.

The other change I made was to add a File.join(Dir.pwd, foo) instead of the bare 'console.log'. Without that, I was getting:

-----
RawFile#0 failed to create the raw output file console.log (VERR_ACCESS_DENIED).
-----

So I included an explicit path (pwd) so the console log was created in the same dir as my Vagrantfile. I also named the console.log with a xenial prefix in case you have multiple boxes that you want to define console.logs for.

[0] - https://www.vagrantup.com/docs/virtualbox/configuration.html

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-18 13:44:01 +0000
+++ debian/changelog	2016-02-22 14:30:54 +0000
@@ -1,3 +1,10 @@
+livecd-rootfs (2.380) UNRELEASED; urgency=medium
+
+  * live-build/ubuntu-cpc/hooks/042-vagrant.binary: add serial device for
+    Vagrant images (LP: #1546108).
+
+ -- Ben Howard <[e-mail]>  Mon, 22 Feb 2016 07:25:55 -0700
+
 livecd-rootfs (2.379) xenial; urgency=medium
 
   * add /var/lib/systemd/rfkill to pre-created dirs to use as writable

=== modified file 'live-build/ubuntu-cpc/hooks/042-vagrant.binary'
--- live-build/ubuntu-cpc/hooks/042-vagrant.binary	2016-02-06 07:39:56 +0000
+++ live-build/ubuntu-cpc/hooks/042-vagrant.binary	2016-02-22 14:30:54 +0000
@@ -112,6 +112,11 @@
   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