Merge lp:~xnox/ubuntu/utopic/upstart/core-split into lp:ubuntu/utopic/upstart

[Dimitri John Ledkov]

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/telinit (upstart-core)

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.

[Martin Pitt (pitti)]

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-maintscript-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.

review: Needs Fixing

[Steve Langasek (vorlon)]

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_completion.d/upstart and /etc/X11/Xsession.d/{00,99}upstart to
> the new upstart-core binary. Thus this needs some dpkg-maintscript-helper
> 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://www.debian.org/
<email address hidden> <email address hidden>

[lp:~xnox/ubuntu/utopic/upstart/core-split]

1588. By Dimitri John Ledkov on 2014-08-04

Split upstart package into upstart & upstart-core. (LP: #1351306)

[Dimitri John Ledkov (xnox)]

No dpkg-maintscripts-helper bits are needed, as no conffiles are renamed nor removed. For conffiles that are taken over by the new package, they are correctly become owned by the new package. (Can be verified with "dpkg --status upstart-core" for example).

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=/sbin/upstart", similarly how it's currently done with systemd package. At the moment I ship system upstart jobs in upstart.

Fixed logrotate & dbus files. Fixed cron file to keep "upstart" name.

[lp:~xnox/ubuntu/utopic/upstart/core-split]

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)]

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-maintscript-helper), but if you tested that changed conffiles are being handled correctly now, that's fine.

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.

review: Needs Fixing

[lp:~xnox/ubuntu/utopic/upstart/core-split]

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)]

Reshuffled manpages & binaries, et.al.

[Martin Pitt (pitti)]

Thanks for the fixes!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-28 10:23:11 +0000
+++ debian/changelog	2014-08-04 15:04:41 +0000
@@ -1,3 +1,9 @@
+upstart (1.13.1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Split upstart package into upstart & upstart-bin. (LP: #1351306)
+
+ -- Dimitri John Ledkov <[e-mail]>  Sun, 03 Aug 2014 18:28:09 +0100
+
 upstart (1.13.1-0ubuntu2) utopic; urgency=medium
 
   * Cherry-pick cgmanager text fix from upstream.

=== modified file 'debian/control'
--- debian/control	2014-06-05 18:04:53 +0000
+++ debian/control	2014-08-04 15:04:41 +0000
@@ -15,17 +15,34 @@
 
 Package: upstart
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
+Depends: upstart-bin (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
 Suggests: python3, graphviz, bash-completion, upstart-monitor
 Replaces: upstart-job, sysvinit, upstart-compat-sysv, startup-tasks, system-services
 Conflicts: upstart-job, sysvinit, upstart-compat-sysv, startup-tasks, system-services, lxcguest
 Provides: upstart-job, upstart-compat-sysv, startup-tasks, system-services
-Breaks: libc6 (<< 2.12.1-0ubuntu12), friendly-recovery (<< 0.2.13)
-Multi-Arch: foreign
-Description: event-based init daemon
- upstart is a replacement for the /sbin/init daemon which handles
- starting of tasks and services during boot, stopping them during
- shutdown and supervising them while the system is running.
+Breaks: libc6 (<< 2.12.1-0ubuntu12), friendly-recovery (<< 0.2.13), initramfs-tools (<< 0.103ubuntu8)
+Multi-Arch: foreign
+Description: event-based init daemon - sysv compat
+ upstart is a replacement for the /sbin/init daemon which handles
+ starting of tasks and services during boot, stopping them during
+ shutdown and supervising them while the system is running.
+ .
+ This package provides sysv compatible binaries.
+
+Package: upstart-bin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
+Suggests: python3, graphviz, bash-completion, upstart-monitor
+Replaces: upstart (<= 1.13.1-0ubuntu2)
+Breaks: upstart (<= 1.13.1-0ubuntu2)
+Multi-Arch: foreign
+Description: event-based init daemon - essential binaries
+ upstart is a replacement for the /sbin/init daemon which handles
+ starting of tasks and services during boot, stopping them during
+ shutdown and supervising them while the system is running.
+ . 
+ This package provides all essential upstart components, sufficient
+ for running user sessions managed by upstart.
 
 Package: upstart-monitor
 Architecture: all

=== modified file 'debian/rules'
--- debian/rules	2013-11-30 07:02:51 +0000
+++ debian/rules	2014-08-04 15:04:41 +0000
@@ -19,7 +19,8 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- --exec-prefix= --enable-selinux \
-		--disable-silent-rules --disable-abi-check
+		--disable-silent-rules --disable-abi-check \
+		--program-transform-name="s/^init$$/upstart/"
 
 override_dh_auto_build:
 	dh_auto_build --parallel
@@ -47,21 +48,12 @@
 # Remove the appropriate dconf files from the upstart package - they
 # will be added used by the upstart-dconf-bridge.install file.
 override_dh_install:
-	dh_install
-	install -m 644 debian/upstart.apport \
-		debian/upstart/usr/share/apport/package-hooks/upstart.py
-	rm debian/upstart/sbin/upstart-dconf-bridge
-	rm debian/upstart/usr/share/upstart/sessions/upstart-dconf-bridge.conf
+	dh_install --list-missing
+	install -m 644 debian/upstart-bin.apport \
+		debian/upstart-bin/usr/share/apport/package-hooks/source_upstart.py
+	rm debian/upstart-bin/usr/share/upstart/sessions/upstart-dconf-bridge.conf
 	rm debian/upstart/etc/init/upstart-event-bridge.conf
 	rm debian/upstart/etc/init/upstart-dbus-bridge.conf
 
-# Remove the following man pages from the upstart package; they will be
-# added to the upstart-monitor and upstart-dconf-bridge packages via
-# their .manpages files, but removing the files here is simpler than
-# specifying every other section 8 manpage in the upstart packages
-# .manpages file.
-override_dh_installman:
-	dh_installman
-	rm debian/upstart/usr/share/man/man8/upstart-monitor.8*
-	rm debian/upstart/usr/share/man/man8/upstart-dconf-bridge.8*
-	rm debian/upstart/usr/share/man/man7/dconf-event.7*
+override_dh_installcron:
+	dh_installcron -p upstart-bin --name upstart

=== renamed file 'debian/upstart.apport' => 'debian/upstart-bin.apport'
=== renamed file 'debian/upstart.bash-completion' => 'debian/upstart-bin.bash-completion'
=== renamed file 'debian/upstart.dirs' => 'debian/upstart-bin.dirs'
--- debian/upstart.dirs	2013-11-30 07:02:51 +0000
+++ debian/upstart-bin.dirs	2014-08-04 15:04:41 +0000
@@ -1,2 +1,1 @@
-var/log/upstart
 usr/share/apport/package-hooks

=== renamed file 'debian/upstart.docs' => 'debian/upstart-bin.docs'
=== renamed file 'debian/upstart.install' => 'debian/upstart-bin.install'
--- debian/upstart.install	2014-05-27 14:14:59 +0000
+++ debian/upstart-bin.install	2014-08-04 15:04:41 +0000
@@ -1,17 +1,40 @@
-debian/conf/*.conf etc/init/
-etc/init/*.conf
-etc/dbus-1/system.d/Upstart.conf
 bin/init-checkconf usr/bin/
 bin/initctl2dot usr/bin/
-sbin/*
-debian/upstart-job lib/init/
-debian/apparmor-profile-load lib/init/
-debian/migrate-inittab.pl usr/lib/upstart/
+sbin/initctl
+sbin/telinit lib/sysvinit/
+sbin/reload
+sbin/restart
+sbin/start
+sbin/status
+sbin/stop
+sbin/upstart
+sbin/upstart-dbus-bridge
+sbin/upstart-event-bridge
+sbin/upstart-file-bridge
 debian/running-in-container bin/
 usr/share/upstart/sessions/*
 debian/user-conf/*.conf usr/share/upstart/sessions/
 debian/xsession.d/* etc/X11/Xsession.d/
 debian/upstart-xsessions etc/
-usr/share/man/man5/*
-usr/share/man/man7/*
-usr/share/man/man8/*
+usr/share/man/man7/upstart.7
+usr/share/man/man7/starting.7
+usr/share/man/man7/stopping.7
+usr/share/man/man7/dbus-event.7
+usr/share/man/man7/session-end.7
+usr/share/man/man7/file-event.7
+usr/share/man/man7/startup.7
+usr/share/man/man7/started.7
+usr/share/man/man7/stopped.7
+usr/share/man/man8/upstart-event-bridge.8
+usr/share/man/man8/init-checkconf.8
+usr/share/man/man8/upstart.8
+usr/share/man/man8/upstart-file-bridge.8
+usr/share/man/man8/upstart-dbus-bridge.8
+usr/share/man/man8/initctl2dot.8
+usr/share/man/man8/initctl.8
+usr/share/man/man5/upstart.5
+usr/share/man/man8/start.8
+usr/share/man/man8/restart.8
+usr/share/man/man8/status.8
+usr/share/man/man8/stop.8
+usr/share/man/man8/reload.8

=== renamed file 'debian/upstart.maintscript' => 'debian/upstart-bin.maintscript'
=== renamed file 'debian/upstart.manpages' => 'debian/upstart-bin.manpages'
=== renamed file 'debian/upstart.postinst' => 'debian/upstart-bin.postinst'
=== renamed file 'debian/upstart.cron.daily' => 'debian/upstart-bin.upstart.cron.daily'
=== modified file 'debian/upstart-dconf-bridge.install'
--- debian/upstart-dconf-bridge.install	2013-08-27 14:28:44 +0000
+++ debian/upstart-dconf-bridge.install	2014-08-04 15:04:41 +0000
@@ -1,2 +1,4 @@
 sbin/upstart-dconf-bridge
 usr/share/upstart/sessions/upstart-dconf-bridge.conf
+usr/share/man/man8/upstart-dconf-bridge.8
+usr/share/man/man7/dconf-event.7

=== removed file 'debian/upstart-dconf-bridge.manpages'
--- debian/upstart-dconf-bridge.manpages	2013-08-27 14:28:44 +0000
+++ debian/upstart-dconf-bridge.manpages	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/man/man8/upstart-dconf-bridge.8
-debian/tmp/usr/share/man/man7/dconf-event.7

=== modified file 'debian/upstart-monitor.install'
--- debian/upstart-monitor.install	2013-03-25 13:54:54 +0000
+++ debian/upstart-monitor.install	2014-08-04 15:04:41 +0000
@@ -1,3 +1,5 @@
 bin/upstart-monitor usr/bin/
 usr/share/icons/hicolor/scalable/apps/upstart-monitor.svg
 usr/share/applications/upstart-monitor.desktop
+usr/share/man/man8/upstart-monitor.8
+usr/share/upstart/icons/upstart-monitor.svg

=== removed file 'debian/upstart-monitor.manpages'
--- debian/upstart-monitor.manpages	2013-03-25 13:54:54 +0000
+++ debian/upstart-monitor.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/tmp/usr/share/man/man8/upstart-monitor.8

=== added file 'debian/upstart.dirs'
--- debian/upstart.dirs	1970-01-01 00:00:00 +0000
+++ debian/upstart.dirs	2014-08-04 15:04:41 +0000
@@ -0,0 +1,1 @@
+var/log/upstart

=== added file 'debian/upstart.install'
--- debian/upstart.install	1970-01-01 00:00:00 +0000
+++ debian/upstart.install	2014-08-04 15:04:41 +0000
@@ -0,0 +1,33 @@
+debian/conf/*.conf etc/init/
+etc/init/*.conf
+etc/dbus-1/system.d/Upstart.conf
+sbin/halt
+sbin/poweroff
+sbin/reboot
+sbin/runlevel
+sbin/shutdown
+sbin/upstart-local-bridge
+sbin/upstart-socket-bridge
+sbin/upstart-udev-bridge
+debian/upstart-job lib/init/
+debian/apparmor-profile-load lib/init/
+debian/migrate-inittab.pl usr/lib/upstart/
+usr/share/man/man7/control-alt-delete.7
+usr/share/man/man7/keyboard-request.7
+usr/share/man/man7/runlevel.7
+usr/share/man/man7/socket-event.7
+usr/share/man/man7/power-status-changed.7
+usr/share/man/man8/shutdown.8
+usr/share/man/man8/upstart-local-bridge.8
+usr/share/man/man8/upstart-udev-bridge.8
+usr/share/man/man8/runlevel.8
+usr/share/man/man8/reboot.8
+usr/share/man/man8/upstart-socket-bridge.8
+usr/share/man/man8/telinit.8
+usr/share/man/man5/inittab.5
+usr/share/man/man7/net-device-added.7
+usr/share/man/man7/drm-device-added.7
+usr/share/man/man7/graphics-device-added.7
+usr/share/man/man7/net-device-removed.7
+usr/share/man/man8/poweroff.8
+usr/share/man/man8/halt.8

=== added file 'debian/upstart.links'
--- debian/upstart.links	1970-01-01 00:00:00 +0000
+++ debian/upstart.links	2014-08-04 15:04:41 +0000
@@ -0,0 +1,3 @@
+sbin/upstart sbin/init
+lib/sysvinit/telinit sbin/telinit
+usr/share/man/man5/upstart.5.gz usr/share/man/man5/init.5.gz

=== modified file 'debian/xsession.d/99upstart'
--- debian/xsession.d/99upstart	2013-05-31 21:13:11 +0000
+++ debian/xsession.d/99upstart	2014-08-04 15:04:41 +0000
@@ -9,6 +9,6 @@
             ;;
     esac
 
-    STARTUP="init --user"
+    STARTUP="upstart --user"
     unset UPSTART
 fi