Merge lp:~xnox/ubiquity/lp1632151 into lp:ubiquity

Proposed by Dimitri John Ledkov on 2016-10-10
Status: Needs review
Proposed branch: lp:~xnox/ubiquity/lp1632151
Merge into: lp:ubiquity
Diff against target: 44 lines (+15/-0)
3 files modified
debian/changelog (+9/-0)
debian/ubiquity.ubiquity.service (+3/-0)
scripts/start-ubiquity-dm (+3/-0)
To merge this branch: bzr merge lp:~xnox/ubiquity/lp1632151
Reviewer Review Type Date Requested Status
Martin Pitt (community) 2016-10-10 Needs Information on 2016-10-12
Ubuntu Installer Team 2016-10-10 Pending
Review via email: mp+308083@code.launchpad.net
To post a comment you must log in.
Dimitri John Ledkov (xnox) wrote :

 * When launching "Install Ubuntu" or when present with try or install ubuntu screen, one cannot login on tty2-6.

 * This impacts debugging facilities during installation.

 * It appears that getty.target is not required by ubiquity, therefore gettys on tty2-6 are not spawned, and no users are allowed to login.

Martin Pitt (pitti) :
review: Needs Fixing
lp:~xnox/ubiquity/lp1632151 updated on 2016-10-11
6495. By Dimitri John Ledkov on 2016-10-11

Fix typpo in the branch

Dimitri John Ledkov (xnox) wrote :

Inline comments.

lp:~xnox/ubiquity/lp1632151 updated on 2016-10-11
6496. By Dimitri John Ledkov on 2016-10-11

Use older bug number

6497. By Dimitri John Ledkov on 2016-10-11

Also force using tty7, by issuing chvt 7 in the start-ubiquity-dm
script. For some reason, active vt is 1 during ubiquity-dm execution.

Martin Pitt (pitti) wrote :

I still don't understand how this does not lead to a dependency cycle: ubiquity.service has Before=plymouth-quit-wait.service and getty@.service has "After=plymouth-quit-wait.service" -- i. e. right now we sort ubiquity ← plymouth ← getty. Thus we can't possibly start getty before ubiquity, which is what the new Requires/After= in this MP does.

Can you please check the journal with this patch to check if there are any dependency loops? If you throw plymouth out of the equation then it should work, but I'm not sure if we are ready to give up on that.

review: Needs Information
Dimitri John Ledkov (xnox) wrote :

I'll check that. My understanding is that normal Ubuntu Desktop and Ubiquity/Installer boots do not need plymouth-quit-wait.service at all, as both lightdm & ubiquity-dm have plymouth integration and stop it if plymouth is running.

The only cases when plymouth-quit-wait is needed I'm guessing is on the server / no display manager setups.

I'm pretty sure we excluded plymouth dependencies dynamically back in the upstart days, by emitting events to by-pass "plymouth-quit-wait".

Unmerged revisions

6497. By Dimitri John Ledkov on 2016-10-11

Also force using tty7, by issuing chvt 7 in the start-ubiquity-dm
script. For some reason, active vt is 1 during ubiquity-dm execution.

6496. By Dimitri John Ledkov on 2016-10-11

Use older bug number

6495. By Dimitri John Ledkov on 2016-10-11

Fix typpo in the branch

6494. By Dimitri John Ledkov on 2016-10-10

Allow tty2-6 logins during maybe-ubiquity and only-ubiquity sessions,
by requiring getty.target in the ubiquity service.file. LP: #1632151

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 2016-10-07 00:06:21 +0000
3+++ debian/changelog 2016-10-11 11:17:59 +0000
4@@ -1,3 +1,12 @@
5+ubiquity (16.10.14) UNRELEASED; urgency=medium
6+
7+ * Allow tty2-6 logins during maybe-ubiquity and only-ubiquity sessions,
8+ by requiring getty.target in the ubiquity service.file. LP: #1567194.
9+ * Also force using tty7, by issuing chvt 7 in the start-ubiquity-dm
10+ script. For some reason, active vt is 1 during ubiquity-dm execution.
11+
12+ -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 11 Oct 2016 00:41:22 +0100
13+
14 ubiquity (16.10.13) yakkety; urgency=medium
15
16 [ Blaze ]
17
18=== modified file 'debian/ubiquity.ubiquity.service'
19--- debian/ubiquity.ubiquity.service 2016-04-18 11:12:16 +0000
20+++ debian/ubiquity.ubiquity.service 2016-10-11 11:17:59 +0000
21@@ -1,6 +1,9 @@
22 [Unit]
23 Description=Ubuntu live CD installer
24 Before=display-manager.service plymouth-quit.service plymouth-quit-wait.service
25+After=getty.target getty@tty7.service
26+Conflicts=getty@tty7.service
27+Requires=getty.target
28
29 [Service]
30 Type=oneshot
31
32=== modified file 'scripts/start-ubiquity-dm'
33--- scripts/start-ubiquity-dm 2015-12-31 00:04:08 +0000
34+++ scripts/start-ubiquity-dm 2016-10-11 11:17:59 +0000
35@@ -62,6 +62,9 @@
36 plymouth quit || :
37 exec ubiquity noninteractive $debug
38 else
39+ # Plymouth on livecd appears to start on vt1, instead of vt7
40+ # even with vt.handoff=7
41+ chvt 7 || :
42 if ! ubiquity-dm vt7 :0 ubuntu /usr/bin/ubiquity $debug $automatic $choose $ldtp --only $frontend; then
43 # has X crashed, or has ubiquity?
44 if [ "$automatic" ] && ! [ -f /var/log/installer/version ]; then

Subscribers

People subscribed via source and target branches

to status/vote changes: