Import patches-unapplied version 2.502 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 3b7b54098b

New changelog entries:
  * Shuffle subiquity service definition to a mix of a snapd-generated service
    file (from the subiquity snap) and an overlay (in this package).

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.502) bionic; urgency=medium
+
+  * Shuffle subiquity service definition to a mix of a snapd-generated service
+    file (from the subiquity snap) and an overlay (in this package).
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 14 Feb 2018 12:46:06 +1300
+
 livecd-rootfs (2.501) bionic; urgency=medium
 
   * Stop building ova, vmdk, vagrant images on i386.

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

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

live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/multi-user.target.wants/subiquity.service

@@ -1 +0,0 @@
-../subiquity.service

live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf

@@ -0,0 +1,14 @@
+[Unit]
+IgnoreOnIsolate=yes
+After=systemd-user-sessions.service plymouth-quit-wait.service
+ConditionPathExists=!/run/subiquity/complete
+
+[Service]
+UtmpIdentifier=tty1
+TTYPath=/dev/tty1
+TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
+KillMode=process
+IgnoreSIGPIPE=no
+SendSIGHUP=yes

live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service

@@ -1,24 +0,0 @@
-[Unit]
-Description=Subiquity debug shell %I
-After=systemd-user-sessions.service plymouth-quit-wait.service
-After=rc-local.service
-IgnoreOnIsolate=yes
-ConditionPathExists=/dev/tty0
-ConditionPathExists=!/run/subiquity/complete
-
-[Service]
-Environment=PYTHONPATH=/usr/share/subiquity
-ExecStartPre=/bin/systemctl stop getty@%I
-ExecStart=/sbin/agetty -n --noclear -l /usr/share/subiquity/subiquity-debug %I $TERM
-ExecStopPost=/bin/systemctl start getty@%I
-Type=idle
-Restart=always
-RestartSec=0
-UtmpIdentifier=%I
-TTYPath=/dev/%I
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-KillMode=process
-IgnoreSIGPIPE=no
-SendSIGHUP=yes

live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service

@@ -1,28 +0,0 @@
-[Unit]
-Description=Subiquity, the installer for Ubuntu Server
-After=systemd-user-sessions.service plymouth-quit-wait.service
-After=rc-local.service
-Requires=snapd.service
-IgnoreOnIsolate=yes
-ConditionPathExists=/dev/tty0
-ConditionPathExists=!/run/subiquity/complete
-
-[Service]
-Environment=PYTHONPATH=/usr/share/subiquity
-Environment=SNAP_REEXEC=0
-ExecStartPre=/bin/systemctl stop getty@tty1
-ExecStartPre=/bin/dmesg -n 1
-ExecStartPre=/snap/bin/subiquity.subiquity-loadkeys
-ExecStart=/sbin/agetty -n --noclear -l /snap/bin/subiquity tty1 $TERM
-ExecStopPost=/bin/systemctl start getty@tty1
-Type=idle
-Restart=always
-RestartSec=0
-UtmpIdentifier=tty1
-TTYPath=/dev/tty1
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-KillMode=process
-IgnoreSIGPIPE=no
-SendSIGHUP=yes