Merge lp:~xnox/ubuntu/utopic/upstart/core-split into lp:ubuntu/utopic/upstart
Status: | Merged |
---|---|
Merged at revision: | 1581 |
Proposed branch: | lp:~xnox/ubuntu/utopic/upstart/core-split |
Merge into: | lp:ubuntu/utopic/upstart |
Diff against target: |
266 lines (+113/-38) 13 files modified
debian/changelog (+6/-0) debian/control (+24/-7) debian/rules (+8/-16) debian/upstart-bin.dirs (+0/-1) debian/upstart-bin.install (+33/-10) debian/upstart-dconf-bridge.install (+2/-0) debian/upstart-dconf-bridge.manpages (+0/-2) debian/upstart-monitor.install (+2/-0) debian/upstart-monitor.manpages (+0/-1) debian/upstart.dirs (+1/-0) debian/upstart.install (+33/-0) debian/upstart.links (+3/-0) debian/xsession.d/99upstart (+1/-1) |
To merge this branch: | bzr merge lp:~xnox/ubuntu/utopic/upstart/core-split |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt | 2014-08-04 | Approve on 2014-08-04 | |
Steve Langasek | 2014-08-04 | Pending | |
Ubuntu branches | 2014-08-04 | Pending | |
Review via email:
|
Description of the change
Split upstart into upstart (/sbin/init provider) and upstart-core (all other binaries).
/sbin/reboot, shutdown, runlevel shipped in (upstart) package
/sbin/init (upstart) is a symlink to /sbin/upstart (upstart-core)
/sbin/telinit (upstart) is a symlink to /lib/sysvinit/
The "funny" location for telinit serves dual purpose. Not needed for session init, thus not on the path without upstart package installed, yet available in the default fallback location that systemctl is configure for such that when one is running upstart as pid 1 and installs systemd-sysvinit, systemctl will use upstart's telinit as a fallback when not booted with systemd.
Steve Langasek (vorlon) wrote : | # |
On Mon, Aug 04, 2014 at 11:09:45AM -0000, Martin Pitt wrote:
> Review: Needs Fixing
>
> Thanks for this! This will allow us to retain session upstart with systemd-sysv.
>
> There are a few inline comments, and I believe this will move
> /etc/bash_
> the new upstart-core binary. Thus this needs some dpkg-maintscrip
> bits for the maintainer files for upgrades.
Moving a conffile between packages does not require maintscript-helper
handling, only moving a conffile to a different path on disk. Moving it
between packages only requires the use of Replaces:.
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://
<email address hidden> <email address hidden>
- 1588. By Dimitri John Ledkov on 2014-08-04
-
Split upstart package into upstart & upstart-core. (LP: #1351306)
Dimitri John Ledkov (xnox) wrote : | # |
No dpkg-maintscrip
Should system upstart jobs be shipped in upstart or upstart-core? If shipped in "upstart-core", one will have ability to boot system with "init=/
Fixed logrotate & dbus files. Fixed cron file to keep "upstart" name.
- 1589. By Dimitri John Ledkov on 2014-08-04
-
Fix cron name.
- 1590. By Dimitri John Ledkov on 2014-08-04
-
Use upstart-bin, not -core name.
Martin Pitt (pitti) wrote : | # |
Ah, thanks for the conffile heads-up. I seem to remember that changed conffiles cause dpkg conffile prompts if they don't get migrated properly (in all times that I looked at moving conffiles I had to add dpkg-maintscrip
I built the branch and did a binary debdiff review:
The manpages for init, telinit, restart etc. went to -bin, but I believe they should stay in "upstart" to avoid a potential conflict?
/var/log/upstart/ should also stay in "upstart".
One emergent issue for renaming the apport hook (see inline comment).
Otherwise, LGTM.
- 1591. By Dimitri John Ledkov on 2014-08-04
-
Reshuffle system-init binaries and manpages.
- 1592. By Dimitri John Ledkov on 2014-08-04
-
Make apport hook operate on source.
- 1593. By Dimitri John Ledkov on 2014-08-04
-
Make user session execute upstart, not init.
Dimitri John Ledkov (xnox) wrote : | # |
Reshuffled manpages & binaries, et.al.
Thanks for this! This will allow us to retain session upstart with systemd-sysv.
There are a few inline comments, and I believe this will move /etc/bash_ completion. d/upstart and /etc/X11/ Xsession. d/{00,99} upstart to the new upstart-core binary. Thus this needs some dpkg-maintscrip t-helper bits for the maintainer files for upgrades.
/etc/logrotate. d/upstart and /etc/dbus- 1/system. d/Upstart. conf should remain in "upstart" itself, thus don't require a transition. This should be fixed in the *.install files.