Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'live-server-serial-argh' into ubuntu/master

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2021-05-11 11:43:32 +12:00
commit cc20dbcf33
7 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.722) UNRELEASED; urgency=medium
* Simplify how getty services are customized / overriden in the live server
installer environment. (LP: #1888497)
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 06 May 2021 10:27:51 +1200
livecd-rootfs (2.721) impish; urgency=medium
[ Dimitri John Ledkov ]

1
live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service Symbolic link
View File

@ -0,0 +1 @@
/dev/null

2
live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service.d/conditional.conf
View File

@ -1,2 +0,0 @@
[Unit]
ConditionPathExists=/run/subiquity/complete

9
live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
View File

@ -1,2 +1,9 @@
[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=
ExecStart=/usr/bin/snap run subiquity.subiquity-service %I

6
live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf
View File

@ -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

23
live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service
View File

@ -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

1
live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
View File

@ -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