Merge ~saviq/ubiquity:support-cloud-init into ubiquity:master

[Michał Sawicz]

[Dimitri John Ledkov (xnox)]

Is this still wanted/needed?

[Michał Sawicz (saviq)]

@Dimitri I believe it is, yes. It's been almost 2 years ago now that I encountered this problem, so everything could have changed…

Unmerged commits

8caaccb... by Michał Sawicz on 2018-10-23

Run after cloud-init if installed

If cloud-init is installed, oem-config should run after it, as it may be
setting up stuff that's prerequisite for oem-config.

diff --git a/data/oem-config.service b/data/oem-config.service
index aa9597b..d5a7eb6 100644
--- a/data/oem-config.service
+++ b/data/oem-config.service
@@ -2,6 +2,7 @@
 Description=End-user configuration after initial OEM installation
 ConditionFileIsExecutable=/usr/sbin/oem-config-firstboot
 ConditionPathExists=/dev/tty1
+After=cloud-init.service
 
 # We never want to run the oem-config job in the live environment (as is the
 # case in some custom configurations) or in recovery mode.
diff --git a/data/oem-config.target b/data/oem-config.target
index a53608b..5738cbb 100644
--- a/data/oem-config.target
+++ b/data/oem-config.target
@@ -4,4 +4,4 @@ Requires=basic.target
 Conflicts=rescue.service rescue.target multi-user.target
 After=basic.target rescue.service rescue.target
 AllowIsolate=yes
-Wants=oem-config.service network-manager.service getty-static.service systemd-user-sessions.service systemd-resolved.service
+Wants=oem-config.service network-manager.service getty-static.service systemd-user-sessions.service systemd-resolved.service cloud-init.service