From b0453f87e85231d00bb5151f08ee030e8a2b02bd Mon Sep 17 00:00:00 2001
From: Robert C Jennings <robert.jennings@canonical.com>
Date: Thu, 25 May 2017 20:35:28 -0500
Subject: [PATCH] ubuntu-cpc: Vagrant config for serial device must be scoped
 for Virtualbox only

  [ Ben Howard ]
  * live-build/ubuntu-cpc/hooks/042-vagrant.binary: scope serial device for
    Virtualbox only.
---
 debian/changelog                               | 8 ++++++++
 live-build/ubuntu-cpc/hooks/042-vagrant.binary | 9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 86590520..124a8f3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.209.15) trusty; urgency=medium
+
+  [ Ben Howard ]
+  * live-build/ubuntu-cpc/hooks/042-vagrant.binary: scope serial device for
+    Virtualbox only.
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  Tue, 24 May 2017 14:22:47 -0500
+
 livecd-rootfs (2.209.14) trusty; urgency=medium
 
   [ Ben Howard ]
diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
index 618d3f9c..bb9f8db1 100644
--- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary
+++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
@@ -113,9 +113,12 @@ Vagrant.configure("2") do |config|
   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" ]
+  config.vm.provider "virtualbox" do |vb|
+     vb.name = "${prefix}"
+     vb.customize [ "modifyvm", :id, "--uart1", "0x3F8", "4" ]
+     vb.customize [ "modifyvm", :id, "--uartmode1", "file", File.join(Dir.pwd, "%s-console.log" % vb.name) ]
+  end
+
 
 end
 EOF