From 303c7a29ec047eca05fe7e078e1fb0e076759fa2 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Date: Tue, 21 Mar 2017 18:32:55 -0400
Subject: [PATCH] Move subiquity systemd service to includes.binary; so that
 it's copied only on the installer overlay.

---
 .../multi-user.target.wants/subiquity.service |  1 +
 .../systemd/system/subiquity-debug@.service   |  0
 .../lib/systemd/system}/subiquity.service     |  0
 .../lib/systemd/system/subiquity.service      | 31 -------------------
 4 files changed, 1 insertion(+), 31 deletions(-)
 create mode 120000 live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service
 rename live-build/ubuntu-server-next/{includes.chroot => includes.binary/boot/overlay.dir}/lib/systemd/system/subiquity-debug@.service (100%)
 rename live-build/ubuntu-server-next/{includes.chroot/lib/systemd/system/multi-user.target.wants => includes.binary/boot/overlay.dir/lib/systemd/system}/subiquity.service (100%)
 delete mode 100644 live-build/ubuntu-server-next/includes.chroot/lib/systemd/system/subiquity.service

diff --git a/live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service b/live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service
new file mode 120000
index 00000000..4d9ea45c
--- /dev/null
+++ b/live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service
@@ -0,0 +1 @@
+../subiquity.service
\ No newline at end of file
diff --git a/live-build/ubuntu-server-next/includes.chroot/lib/systemd/system/subiquity-debug@.service b/live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service
similarity index 100%
rename from live-build/ubuntu-server-next/includes.chroot/lib/systemd/system/subiquity-debug@.service
rename to live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service
diff --git a/live-build/ubuntu-server-next/includes.chroot/lib/systemd/system/multi-user.target.wants/subiquity.service b/live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service
similarity index 100%
rename from live-build/ubuntu-server-next/includes.chroot/lib/systemd/system/multi-user.target.wants/subiquity.service
rename to live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service
diff --git a/live-build/ubuntu-server-next/includes.chroot/lib/systemd/system/subiquity.service b/live-build/ubuntu-server-next/includes.chroot/lib/systemd/system/subiquity.service
deleted file mode 100644
index 2b40f7c0..00000000
--- a/live-build/ubuntu-server-next/includes.chroot/lib/systemd/system/subiquity.service
+++ /dev/null
@@ -1,31 +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
-ExecStartPre=/bin/systemctl stop getty@tty1
-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
-
-#KillMode=process
-#Restart=always
-#StandardInput=tty-force
-#StandardOutput=tty
-#StandardError=tty