ubiquity

Merge lp:~vorlon/ubiquity/conflict-with-getty1 into lp:ubiquity

  1. conflict-with-getty1
  2. Merge into trunk
Proposed by Steve Langasek
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: no longer in the source branch.
Merged at revision: 6609
Proposed branch: lp:~vorlon/ubiquity/conflict-with-getty1
Merge into: lp:ubiquity
Diff against target: 27 lines (+9/-0)
2 files modified
debian/changelog (+8/-0)
debian/ubiquity.ubiquity.service (+1/-0)
To merge this branch: bzr merge lp:~vorlon/ubiquity/conflict-with-getty1
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+342977@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Yup.

review: Approve
lp:~vorlon/ubiquity/conflict-with-getty1 updated
6609. By Steve Langasek

If we are running ubiquity-dm on VT1, we must conflict with
<email address hidden> and not rely on some other display manager to do
this for us.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2018-04-10 15:26:46 +0000
3+++ debian/changelog 2018-04-11 00:30:37 +0000
4@@ -1,3 +1,11 @@
5+ubiquity (18.04.6) UNRELEASED; urgency=medium
6+
7+ * If we are running ubiquity-dm on VT1, we must conflict with
8+ getty@getty1.service and not rely on some other display manager to do
9+ this for us.
10+
11+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 10 Apr 2018 17:14:29 -0700
12+
13 ubiquity (18.04.5) bionic; urgency=medium
14
15 [ Steve Langasek ]
16
17=== modified file 'debian/ubiquity.ubiquity.service'
18--- debian/ubiquity.ubiquity.service 2018-04-05 08:13:57 +0000
19+++ debian/ubiquity.ubiquity.service 2018-04-11 00:30:37 +0000
20@@ -1,6 +1,7 @@
21 [Unit]
22 Description=Ubuntu live CD installer
23 Before=display-manager.service plymouth-quit.service
24+Conflicts=getty@getty1.service
25
26 [Service]
27 Type=oneshot

Subscribers

People subscribed via source and target branches

to status/vote changes: