From c887ebdadc2419b542d6e4d65b5ba4cecda4817b Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Mon, 21 Jun 2021 00:30:37 +0000 Subject: [PATCH] Imported 2.726 No reason for CPC update specified. --- debian/changelog | 7 +++++++ .../subiquity-serial.conf | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8bda5778..6c7c35bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.726) impish; urgency=medium + + * Fix overriding of ExecStart in + serial-getty@sclp_line0.service.d/subiquity-serial.conf. + + -- Michael Hudson-Doyle Sat, 19 Jun 2021 11:44:33 +1200 + livecd-rootfs (2.725) impish; urgency=medium * Revert previous change. I was too impatient and didn't wait long enough diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf index 739e5568..0af8e7fa 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf +++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf @@ -1,2 +1,3 @@ [Service] +ExecStart= ExecStart=/usr/bin/snap run subiquity --ssh