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

Imported using git-ubuntu import.

Changelog parent: 718c2fc269

New changelog entries:
  * Rename the directory containing the systemd override file for subiquity to
    the correct name :/
  * Add Environment=SNAP_REEXEC=0 to the above override file.
  * Remove the snap.subiquity.started overrides, that service is long gone.

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (2.510) bionic; urgency=medium
+
+  * Rename the directory containing the systemd override file for subiquity to
+    the correct name :/
+  * Add Environment=SNAP_REEXEC=0 to the above override file.
+  * Remove the snap.subiquity.started overrides, that service is long gone.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 15 Mar 2018 14:09:57 +1300
+
 livecd-rootfs (2.509) bionic; urgency=medium
 
   [ Steve Langasek ]

live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snap.subiquity.started.service.d/no-reexec.conf

@@ -1,3 +0,0 @@
-[Service]
-RemainAfterExit=yes
-Environment=SNAP_REEXEC=0

live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.refresh.timer

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

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

@@ -4,6 +4,7 @@ After=systemd-user-sessions.service plymouth-quit-wait.service
 ConditionPathExists=!/run/subiquity/complete
 
 [Service]
+Environment=SNAP_REEXEC=0
 UtmpIdentifier=tty1
 TTYPath=/dev/tty1
 TTYReset=yes