From 745856c1d8a7871fe5cabfe2285758082bf050b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@ubuntu.com>
Date: Thu, 3 Mar 2016 10:07:26 +0100
Subject: [PATCH] Import patches-unapplied version 2.381 to
 ubuntu/xenial-proposed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Imported using git-ubuntu import.

Changelog parent: 5bc52b48769f2082c67ad4d3b33ab4fb77ff04b8

New changelog entries:
  [ Ben Howard ]
  * live-build/ubuntu-cpc/hooks/042-vagrant.binary: scope serial device for
    Virtualbox only.
  [ Łukasz 'sil2100' Zemczak ]
  * Update the debootstrap group and gshadow hashes for ubuntu-touch.
---
 debian/changelog                                      | 11 +++++++++++
 live-build/ubuntu-cpc/hooks/042-vagrant.binary        |  9 ++++++---
 .../ubuntu-touch/hooks/00-uid-gid-fix.chroot_early    |  4 ++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1dcec27d..8d0769de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+livecd-rootfs (2.381) xenial; urgency=medium
+
+  [ Ben Howard ]
+  * live-build/ubuntu-cpc/hooks/042-vagrant.binary: scope serial device for
+    Virtualbox only.
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Update the debootstrap group and gshadow hashes for ubuntu-touch.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 03 Mar 2016 10:07:26 +0100
+
 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
diff --git a/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early
index 2b5cfc69..5dcbc976 100755
--- a/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early
+++ b/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early
@@ -5,8 +5,8 @@ ERRCNT=""
 # Known good post-debootstrap values
 passwd_bootstrap="12e43f2db1904588e57222ec6dc5680e"
 shadow_bootstrap="68a335c6f7f9e8d26c1dc98b0004b57a"
-group_bootstrap="eb863998da1d7cad986cea2466ef23a1"
-gshadow_bootstrap="5da14ec60af7c53eacadc05859bfd5f4"
+group_bootstrap="aaf84a9eebc91636adb0e2b38cedd0e1"
+gshadow_bootstrap="7c976f5ac7b8f8207c7009dcac48eecb"
 
 # Current post-debootstrap values
 passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1)