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

Proposed by Michał Sawicz on 2018-10-23
Status: Needs review
Proposed branch: ~saviq/ubiquity:support-cloud-init
Merge into: ubiquity:master
Diff against target: 22 lines (+2/-1)
2 files modified
data/oem-config.service (+1/-0)
data/oem-config.target (+1/-1)
Reviewer Review Type Date Requested Status
Ken VanDine 2018-10-23 Pending
Ubuntu Installer Team 2018-10-23 Pending
Review via email: mp+357727@code.launchpad.net
To post a comment you must log in.

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/data/oem-config.service b/data/oem-config.service
2index aa9597b..d5a7eb6 100644
3--- a/data/oem-config.service
4+++ b/data/oem-config.service
5@@ -2,6 +2,7 @@
6 Description=End-user configuration after initial OEM installation
7 ConditionFileIsExecutable=/usr/sbin/oem-config-firstboot
8 ConditionPathExists=/dev/tty1
9+After=cloud-init.service
10
11 # We never want to run the oem-config job in the live environment (as is the
12 # case in some custom configurations) or in recovery mode.
13diff --git a/data/oem-config.target b/data/oem-config.target
14index a53608b..5738cbb 100644
15--- a/data/oem-config.target
16+++ b/data/oem-config.target
17@@ -4,4 +4,4 @@ Requires=basic.target
18 Conflicts=rescue.service rescue.target multi-user.target
19 After=basic.target rescue.service rescue.target
20 AllowIsolate=yes
21-Wants=oem-config.service network-manager.service getty-static.service systemd-user-sessions.service systemd-resolved.service
22+Wants=oem-config.service network-manager.service getty-static.service systemd-user-sessions.service systemd-resolved.service cloud-init.service

Subscribers

People subscribed via source and target branches