From 7ba371b3152a54137300560d3ed3cf627da9f7d5 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 21 Apr 2021 11:38:41 +1200 Subject: [PATCH] Simplify how serial-getty@.service is customized in the live server installer environment. --- debian/changelog | 7 ++++++ .../getty@tty1.service.d/conditional.conf | 2 -- .../subiquity-serial.conf | 8 ++++++- .../subiquity-serial.conf | 6 +---- .../systemd/system/serial-subiquity@.service | 23 ------------------- .../subiquity.conf | 1 - 6 files changed, 15 insertions(+), 32 deletions(-) delete mode 100644 live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service.d/conditional.conf delete mode 100644 live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service diff --git a/debian/changelog b/debian/changelog index a898d2de..30f35f74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.720) UNRELEASED; urgency=medium + + * Simplify how serial-getty@.service is customized in the live server + installer environment. + + -- Michael Hudson-Doyle Wed, 21 Apr 2021 11:37:17 +1200 + livecd-rootfs (2.719) hirsute; urgency=medium * Our raspi server images should have used the raspi-server seed in hirsute, diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service.d/conditional.conf b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service.d/conditional.conf deleted file mode 100644 index da3eed67..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service.d/conditional.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -ConditionPathExists=/run/subiquity/complete \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf index 9aef8ee3..576aedb1 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf +++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf @@ -1,2 +1,8 @@ +[Unit] +Description=Subiquity, the installer for Ubuntu Server %I +After=snapd.seeded.service +StartLimitInterval=0 + [Service] -ExecStartPre=/bin/systemctl start serial-subiquity@%i.service +Environment=SNAP_REEXEC=0 +ExecStart=/usr/bin/snap run subiquity.subiquity-service %I 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 7aa450d4..739e5568 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,6 +1,2 @@ -[Unit] -After=cloud-final.service snapd.seeded.service [Service] -StandardOutput=tty -ExecStartPre= -ExecStartPre=/usr/bin/snap run subiquity --ssh +ExecStart=/usr/bin/snap run subiquity --ssh diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service deleted file mode 100644 index cf1d32f7..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service +++ /dev/null @@ -1,23 +0,0 @@ -[Unit] -Description=Subiquity, the installer for Ubuntu Server %I -BindsTo=dev-%i.device -After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service cloud-final.service snapd.seeded.service -After=rc-local.service -ConditionPathExists=!/run/subiquity/complete -StartLimitInterval=0 - -[Service] -Environment=SNAP_REEXEC=0 -ExecStartPre=/bin/systemctl stop serial-getty@%I -ExecStart=/usr/bin/snap run subiquity.subiquity-service %I -ExecStopPost=/bin/systemctl start serial-getty@%I -Type=idle -Restart=always -RestartSec=0 -UtmpIdentifier=%I -TTYPath=/dev/%I -TTYReset=yes -TTYVHangup=yes -KillMode=process -IgnoreSIGPIPE=no -SendSIGHUP=yes diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf index c2b64591..c1af5666 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf +++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf @@ -1,7 +1,6 @@ [Unit] IgnoreOnIsolate=yes After=systemd-user-sessions.service plymouth-quit-wait.service snap.seeded.service -ConditionPathExists=!/run/subiquity/complete [Service] Environment=SNAP_REEXEC=0