ubiquity

Merge ~mwhudson/ubiquity:lp-1777900 into ubiquity:master

  1. Git
  2. lp:~mwhudson/ubiquity
  3. lp-1777900
  4. Merge into master
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 56d5433326520df0783c672d41a6cb7c1a01e34d
Proposed branch: ~mwhudson/ubiquity:lp-1777900
Merge into: ubiquity:master
Diff against target: 10 lines (+1/-1)
1 file modified
data/oem-config.target (+1/-1)
Reviewer Review Type Date Requested Status
Adam Conrad (community) Approve
Review via email: mp+352792@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Adam Conrad (adconrad) wrote :

Tested, works, merged.

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.target b/data/oem-config.target
2index 0bf4b72..a53608b 100644
3--- a/data/oem-config.target
4+++ b/data/oem-config.target
5@@ -4,4 +4,4 @@ Requires=basic.target
6 Conflicts=rescue.service rescue.target multi-user.target
7 After=basic.target rescue.service rescue.target
8 AllowIsolate=yes
9-Wants=oem-config.service network-manager.service getty-static.service systemd-user-sessions.service
10+Wants=oem-config.service network-manager.service getty-static.service systemd-user-sessions.service systemd-resolved.service

Subscribers

People subscribed via source and target branches