Merge lp://staging/~xnox/ubuntu/trusty/plymouth/private-upstart-socket into lp://staging/ubuntu/trusty/plymouth
| Status: | Merged |
|---|---|
| Merged at revision: | 1480 |
| Proposed branch: | lp://staging/~xnox/ubuntu/trusty/plymouth/private-upstart-socket |
| Merge into: | lp://staging/ubuntu/trusty/plymouth |
| Diff against target: |
4818 lines (+4385/-150) 21 files modified
.pc/applied-patches (+4/-0) .pc/dont-bail-on-dummy-terms.patch/src/upstart-bridge/plymouth-upstart-bridge.c (+339/-0) .pc/no-print-empty-description.patch/src/upstart-bridge/ply-upstart-monitor.c (+1182/-0) .pc/ubuntu-logo-scale-factor-2.patch/themes/ubuntu-logo/Makefile.am (+23/-0) .pc/ubuntu-logo-scale-factor-2.patch/themes/ubuntu-logo/ubuntu-logo.plymouth.in (+8/-0) .pc/use-upstart-private-socket.patch/src/upstart-bridge/ply-upstart-monitor.c (+1301/-0) debian/changelog (+22/-0) debian/control (+1/-1) debian/patches/dont-bail-on-dummy-terms.patch (+17/-0) debian/patches/no-print-empty-description.patch (+14/-0) debian/patches/series (+4/-0) debian/patches/ubuntu-logo-scale-factor-2.patch (+1202/-0) debian/patches/use-upstart-private-socket.patch (+198/-0) debian/plymouth-theme-ubuntu-logo.postinst (+6/-0) debian/plymouth-theme-ubuntu-logo.prerm (+2/-0) debian/plymouth.plymouth-upstart-bridge.upstart (+5/-2) src/upstart-bridge/ply-upstart-monitor.c (+11/-130) src/upstart-bridge/plymouth-upstart-bridge.c (+3/-1) themes/ubuntu-logo/Makefile.am (+18/-5) themes/ubuntu-logo/ubuntu-logo.plymouth.in (+2/-2) themes/ubuntu-logo/ubuntu-logo.script.in (+23/-9) |
| To merge this branch: | bzr merge lp://staging/~xnox/ubuntu/trusty/plymouth/private-upstart-socket |
| Related bugs: | |
| Related blueprints: |
Boot experience on hidpi displays
(Undefined)
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Hunt | Pending | ||
| Stéphane Graber | Pending | ||
| Colin Watson | Pending | ||
| Steve Langasek | Pending | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Commit message
* debian/
system dbus, use private upstart socket in the plymouth-
* debian/
plymouth-
boot.log.
* debian/
plymouth-
terminal, as we can run on those. This makes console-log useful in
lxc-containers and actually contain messages from upstart jobs
starting and stopping.
* debian/
description when dbus returns empty string, and thus stop printing
empty "Starting... done" messages.
* debian/
conditions to stop when plymouth-shutdown finishes.
* Make ubuntu-logo theme support scale factor, provide one plymouth
theme with scale 1 and another with scale 2, until scale factor can be
dynamically detected.
* Mark plymouth-
Description of the change
First this patch series fixes to use upstart private socket, and thus able to start on startup. That was mostly removing code to deal with system-bus, looking up nameowner, and monitoring nameowner changes.
Next I've tried testing plymouth-
This resulted in loads of empty messages, but it was never intended to print empty messages, so i've fixed that (dbus returns empty string, not NULL).
And i've also removed description stanza from the startpar bridge (separate upload) such that one does not get extra messages about startpar bridge firing, for every upstart job that is printed.
One now gets a more complete /var/log/boot.log on more ubuntu configurations.
For HiDPI support, I've tweaked ubuntu-logo theme to support "scalingfactor" for all loaded images/text/layout, and generated one theme with scalingfactor set to 1 (same as current theme) and another one with scalingfactor set to 2 to support highdpi screens via update-
