ubiquity

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

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

LGTM

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
11diff --git a/debian/changelog b/debian/changelog
12index 83b772e..45ca6e6 100644
13--- a/debian/changelog
14+++ b/debian/changelog
15@@ -3,6 +3,9 @@ ubiquity (18.04.14.7) UNRELEASED; urgency=medium
16 [ Dariusz Gadomski ]
17 * Implement missing reboot and shutdown methods in debconf_ui (LP: #1749289)
18
19+ [ Michael Hudson-Doyle ]
20+ * Add systemd-resolved to oem-config.target's Wants (LP: #1777900)
21+
22 -- Adam Conrad <adconrad@ubuntu.com> Wed, 08 Aug 2018 19:53:55 -0600
23
24 ubiquity (18.04.14.6) bionic; urgency=medium

Subscribers

People subscribed via source and target branches