From f3d90d962f030f47c81651ddb6edbeb0b98b7026 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 22 Feb 2016 15:57:38 -0700 Subject: [PATCH] live-build/ubuntu-cpc/hooks/042-vagrant.binary: scope serial device for Virtualbox only. --- debian/changelog | 7 +++++++ live-build/ubuntu-cpc/hooks/042-vagrant.binary | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1dcec27d..208791c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (1:2.381) UNRELEASED; urgency=medium + + * live-build/ubuntu-cpc/hooks/042-vagrant.binary: scope serial device for + Virtualbox only. + + -- Ben Howard Mon, 22 Feb 2016 15:55:53 -0700 + livecd-rootfs (2.380) xenial; 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 100755 --- 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