Merge lp:~mwhudson/livecd-rootfs/subiquity-serial into lp:livecd-rootfs

[Michael Hudson-Doyle]

Adam managed to convince me that we shouldn't assume any serial consoles on x86 by default but if the user does tell us/systemd about one, we should probably run subiquity on it rather than a getty the user cannot log in at.

[lp:~mwhudson/livecd-rootfs/subiquity-serial]

1604. By Michael Hudson-Doyle on 2018-01-31

remove some commented out gunk from .service files

1605. By Michael Hudson-Doyle on 2018-01-31

merge trunk

[Adam Conrad (adconrad)]

LGTM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-01-30 11:51:23 +0000
+++ debian/changelog	2018-01-31 08:59:58 +0000
@@ -1,3 +1,10 @@
+livecd-rootfs (2.493) UNRELEASED; urgency=medium
+
+  * Run subiquity on any serial consoles that the user told systemd
+    about.
+
+ -- Michael Hudson-Doyle <[e-mail]>  Wed, 31 Jan 2018 21:58:33 +1300
+
 livecd-rootfs (2.492) bionic; urgency=medium
 
   * Oops. I shouldn't reference my private stuff.

=== added directory 'live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d'
=== added file 'live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf'
--- live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf	1970-01-01 00:00:00 +0000
+++ live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf	2018-01-31 08:59:58 +0000
@@ -0,0 +1,2 @@
+[Service]
+ExecStartPre=/bin/systemctl start serial-subiquity@%i.service

=== added file 'live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service'
--- live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service	1970-01-01 00:00:00 +0000
+++ live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service	2018-01-31 08:59:58 +0000
@@ -0,0 +1,23 @@
+[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
+After=rc-local.service
+ConditionPathExists=!/run/subiquity/complete
+StartLimitInterval=0
+
+[Service]
+Environment=PYTHONPATH=/usr/share/subiquity
+ExecStartPre=/bin/systemctl stop serial-getty@%I
+ExecStart=/sbin/agetty -n --keep-baud -l /snap/bin/subiquity --login-options "--serial" 115200,38400,9600 %I $TERM
+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

=== modified file 'live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service'
--- live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service	2017-03-21 22:32:55 +0000
+++ live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service	2018-01-31 08:59:58 +0000
@@ -22,9 +22,3 @@
 KillMode=process
 IgnoreSIGPIPE=no
 SendSIGHUP=yes
-
-#KillMode=process
-#Restart=always
-#StandardInput=tty-force
-#StandardOutput=tty
-#StandardError=tty

=== modified file 'live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service'
--- live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service	2017-10-18 00:26:08 +0000
+++ live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service	2018-01-31 08:59:58 +0000
@@ -26,9 +26,3 @@
 KillMode=process
 IgnoreSIGPIPE=no
 SendSIGHUP=yes
-
-#KillMode=process
-#Restart=always
-#StandardInput=tty-force
-#StandardOutput=tty
-#StandardError=tty