lp://staging/~xnox/ubuntu/trusty/plymouth/private-upstart-socket

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu/trusty/plymouth at revision 1480

James Hunt: Pending requested 2014-03-13

Stéphane Graber: Pending requested 2014-03-13

Colin Watson: Pending requested 2014-03-12

Steve Langasek: Pending requested 2014-03-12

Ubuntu branches: Pending requested 2014-03-12

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1185560: Console <-> Upstart bridge shows very confusing and unhelpful "Starting" and "Stopping" with no descriptions	Medium	Fix Released
Bug #1292458: [FFe] a bunch of updates to plymouth	Undecided	Fix Released

Link a bug report

Related blueprints

1480. By Dimitri John Ledkov on 2014-03-14

[ Dimitri John Ledkov ] LP: #1292458

1479. By Dimitri John Ledkov on 2014-03-13

Fix up scale-factor-2 patch

1478. By Dimitri John Ledkov on 2014-03-13

Mark plymouth-upstart-bridge to respawn.

1477. By Dimitri John Ledkov on 2014-03-13

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.

1476. By Dimitri John Ledkov on 2014-03-13

  empty "Starting... done" messages. LP: #1185560.

1475. By Dimitri John Ledkov on 2014-03-13

debian/plymouth.plymouth-upstart-bridge.upstart: update stop on
conditions to stop when plymouth-shutdown finishes.

1474. By Dimitri John Ledkov on 2014-03-13

* debian/patches/no-print-empty-description.patch: do not store
description when dbus returns empty string, and thus stop printing
empty "Starting... done" messages.

1473. By Dimitri John Ledkov on 2014-03-13

system dbus, use private upstart socket in the plymouth-upstart-bridge.
* debian/patches/dont-bail-on-dummy-terms.patch: don't bail
plymouth-upstart-bridge if TERM is not set and/or running on a dummy
terminal, as we can run on those.

1472. By Dimitri John Ledkov on 2014-03-12

* debian/patches/use-upstart-private-socket.patch: instead of using
  system dbus, use private upstart socket.
* debian/plymouth.plymouth-upstart-bridge.upstart: start
  plymouth-upstart-bridge on startup, and thus gather a more complete
  boot.log.

1471. By Steve Langasek on 2014-03-06

Apparently this fixes two bugs instead of one