ubiquity

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

  1. Git
  2. lp:~saviq/ubiquity
  3. support-cloud-init
  4. Merge into main
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: afb394c409b6da7f63cbd9774b1dbe6a52e89fd6
Proposed branch: ~saviq/ubiquity:support-cloud-init
Merge into: ubiquity:main
Diff against target: 25 lines (+5/-0) (has conflicts)
2 files modified
data/oem-config.service (+1/-0)
data/oem-config.target (+4/-0)
Conflict in data/oem-config.target
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Approve
Ken VanDine Pending
Review via email: mp+426011@code.launchpad.net

This proposal supersedes a proposal from 2018-10-23.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote : Posted in a previous version of this proposal

Is this still wanted/needed?

Revision history for this message
Michał Sawicz (saviq) wrote : Posted in a previous version of this proposal

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

Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve

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 b5f0d7e..35ae6bc 100644
15--- a/data/oem-config.target
16+++ b/data/oem-config.target
17@@ -4,4 +4,8 @@ Requires=basic.target
18 Conflicts=rescue.service rescue.target multi-user.target
19 After=basic.target rescue.service rescue.target
20 AllowIsolate=yes
21+<<<<<<< data/oem-config.target
22 Wants=oem-config.service NetworkManager.service getty-static.service systemd-user-sessions.service systemd-resolved.service
23+=======
24+Wants=oem-config.service network-manager.service getty-static.service systemd-user-sessions.service systemd-resolved.service cloud-init.service
25+>>>>>>> data/oem-config.target

Subscribers

People subscribed via source and target branches