Merge lp:~cyphermox/ubiquity/oem-config into lp:ubiquity

[Mathieu Trudel-Lapierre]

oem-config work to better handle systemd -- introducing a new oem-config.target rather than using a flag to control the starting of oem-config.

This also fixes issues with the oem user not always being removed successfully (because it turned out that oem-config would start as well as parts of the graphical.target, so oem could have some processes running)

[Dimitri John Ledkov (xnox)]

review: Approve

[lp:~cyphermox/ubiquity/oem-config]

6285. By Mathieu Trudel-Lapierre on 2015-04-02

Remove sleep+kill, it's unnecessary if the graphical target never gets to start (ie. doesn't try to start display-manager)

[Mathieu Trudel-Lapierre (cyphermox)]

Approving the extra commit, which is a change we discussed on #ubuntu-installer.

review: Approve

=== modified file 'bin/oem-config-firstboot'
--- bin/oem-config-firstboot	2013-10-14 17:27:56 +0000
+++ bin/oem-config-firstboot	2015-04-02 17:55:20 +0000
@@ -77,6 +77,8 @@
 			pkill -u oem || true
 			userdel --force --remove oem || true
 		fi
+		/bin/systemctl set-default graphical.target || true
+		/bin/systemctl --no-block isolate graphical.target || true
 		exit 0
 	elif [ "$CODE" -eq 10 ]; then
 		cat <<EOF

=== modified file 'bin/oem-config-prepare'
--- bin/oem-config-prepare	2015-02-18 21:02:05 +0000
+++ bin/oem-config-prepare	2015-04-02 17:55:20 +0000
@@ -28,7 +28,7 @@
 	# Potentially sensitive.
 	rm -f /home/oem/.ssh/known_hosts
 
-	touch /var/lib/oem-config/run
+	/bin/systemctl set-default oem-config.target
 else
 	pkexec "$0" ${quiet:---quiet} "$@"
 fi

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-24 20:18:03 +0000
+++ debian/changelog	2015-04-02 17:55:20 +0000
@@ -1,3 +1,23 @@
+ubiquity (2.21.18) UNRELEASED; urgency=medium
+
+  * Overhaul for proper systemd support (LP: #1436937)
+  * bin/oem-config-prepare: set the systemd default target to oem-config.target
+    instead of using /var/lib/oem-config/run as a flag.
+  * bin/oem-config-firstboot:
+    - after removing the oem user, set the default target back to graphical.
+    - call for systemd to start the graphical target, so as to complete booting
+      to graphical or to TTYs after oem-config-firstboot has run.
+  * debian/oem-config.target: create a new target for oem-config so that it can
+    start without conflicting with a display-manager that may also want to
+    start and use the oem user in auto-login.
+  * debian/oem-config.oem-config.service: simplify the service's start
+    conditions; we don't really need to worry about Before/After since we'll
+    run in our own isolated target.
+  * debian/oem-config.install: force the installation of the new target in the
+    right location for systemd.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 02 Apr 2015 11:03:51 -0400
+
 ubiquity (2.21.17) vivid; urgency=medium
 
   * Update the sed for the path to keyboard-configuration.config from

=== modified file 'debian/oem-config.install'
--- debian/oem-config.install	2010-04-13 23:49:07 +0000
+++ debian/oem-config.install	2015-04-02 17:55:20 +0000
@@ -3,3 +3,4 @@
 bin/oem-config-remove usr/sbin
 bin/oem-config-wrapper usr/sbin
 scripts/ubi-reload-keyboard /usr/lib/oem-config/post-install
+debian/oem-config.target /lib/systemd/system

=== modified file 'debian/oem-config.oem-config.service'
--- debian/oem-config.oem-config.service	2015-01-15 11:00:28 +0000
+++ debian/oem-config.oem-config.service	2015-04-02 17:55:20 +0000
@@ -1,10 +1,6 @@
 [Unit]
 Description=End-user configuration after initial OEM installation
-Before=display-manager.service
-After=plymouth-quit.service
-Conflicts=[e-mail]
 ConditionFileIsExecutable=/usr/sbin/oem-config-firstboot
-ConditionPathExists=/var/lib/oem-config/run
 ConditionPathExists=/dev/tty1
 
 # We never want to run the oem-config job in the live environment (as is the
@@ -33,4 +29,4 @@
     exec oem-config-firstboot $debug $automatic'
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=oem-config.target

=== added file 'debian/oem-config.target'
--- debian/oem-config.target	1970-01-01 00:00:00 +0000
+++ debian/oem-config.target	2015-04-02 17:55:20 +0000
@@ -0,0 +1,7 @@
+[Unit]
+Description=OEM Configuration
+Requires=basic.target
+Conflicts=rescue.service rescue.target multi-user.target
+After=basic.target rescue.service rescue.target
+AllowIsolate=yes
+Wants=oem-config.service