diff --git a/debian/changelog b/debian/changelog index 6d96fb29..0d7b71ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.687) groovy; urgency=medium + + [ Stanislav German-Evtushenko / John Chittum ] + * Send Vagrant serial connection to NULL. (LP: #1874453) + + -- Robert C Jennings Tue, 15 Sep 2020 15:25:19 -0500 + livecd-rootfs (2.686) groovy; urgency=medium [ Dan Streetman ] diff --git a/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary b/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary index f9b21d38..3b52dbfe 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary @@ -154,8 +154,16 @@ Vagrant.configure("2") do |config| config.vm.provider "virtualbox" do |vb| vb.customize [ "modifyvm", :id, "--uart1", "0x3F8", "4" ] -# Creating a console log file is not an expected behavior for vagrant boxes. LP #1777827 -# vb.customize [ "modifyvm", :id, "--uartmode1", "file", File.join(Dir.pwd, "${prefix}-console.log") ] + # Create a NULL serial port to skip console logging by default + vb.customize [ "modifyvm", :id, "--uartmode1", "file", File::NULL ] + # If console logging is desired, uncomment this line and remove prior + # vb.customize [ "modifyvm", :id, "--uartmode1", "file", File.join(Dir.pwd, "${prefix}-console.log") ] + # Ubuntu cloud images, by default, enable console=ttyS0. This enables serial consoles to + # connect to the images. With the change related to LP #1777827, removing a serial + # file logger, Vagrant image boot times increased and now run greater than 5 minutes + # Creating a console log file is not an expected defaul behavior for vagrant boxes. + # As a workaround, we create a console connection to File:NULL. LP #1874453 + # This is overwriteable in user files to write to a local file end end EOF