From 060069bc77a7bee5c3258f56ca8c33d900c5d9de Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@ubuntu.com>
Date: Thu, 21 Sep 2017 11:34:20 +1200
Subject: [PATCH] Import patches-unapplied version 2.459 to
ubuntu/artful-proposed
Imported using git-ubuntu import.
Changelog parent: e4b41272e202e6ea178e9752fe4967de9f33a5fb
New changelog entries:
[ Steve Langasek ]
* Remove spurious call to 'sync'; we don't need to flush all disk caches
on the system to cleanly unmount a partition.
[ Michael Hudson-Doyle ]
* only show alert (i.e. panic) kernel messages on the console when
subiquity is running
---
debian/changelog | 12 ++++++++++++
.../ubuntu-cpc/hooks/033-disk-image-uefi.binary | 1 -
.../overlay/lib/systemd/system/subiquity.service | 1 +
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index a72bd105..cee78e24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+livecd-rootfs (2.459) artful; urgency=medium
+
+ [ Steve Langasek ]
+ * Remove spurious call to 'sync'; we don't need to flush all disk caches
+ on the system to cleanly unmount a partition.
+
+ [ Michael Hudson-Doyle ]
+ * only show alert (i.e. panic) kernel messages on the console when
+ subiquity is running
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 21 Sep 2017 11:34:20 +1200
+
livecd-rootfs (2.458) artful; urgency=medium
* Move default netplan config for server-live image to where hook will
diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
index 47ec647f..dd48af3f 100755
--- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
@@ -110,7 +110,6 @@ install_grub() {
chroot mountpoint apt-get -y clean
rm mountpoint/tmp/device.map
- sync
umount mountpoint/boot/efi
mount
umount_partition mountpoint
diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service
index 2b40f7c0..e241d307 100644
--- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service
+++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service
@@ -10,6 +10,7 @@ ConditionPathExists=!/run/subiquity/complete
[Service]
Environment=PYTHONPATH=/usr/share/subiquity
ExecStartPre=/bin/systemctl stop getty@tty1
+ExecStartPre=/bin/dmesg -n 1
ExecStart=/sbin/agetty -n --noclear -l /snap/bin/subiquity tty1 $TERM
ExecStopPost=/bin/systemctl start getty@tty1
Type=idle