lp://staging/~xnox/ubuntu/utopic/sysvinit/upstart-task
- Get this branch:
- bzr branch lp://staging/~xnox/ubuntu/utopic/sysvinit/upstart-task
Branch merges
- Martin Pitt: Needs Fixing
- Adam Conrad: Pending requested
- Stéphane Graber: Pending requested
- Steve Langasek: Pending requested
- Ubuntu branches: Pending requested
-
Diff: 812 lines (+739/-4) (has conflicts)7 files modified.pc/applied-patches (+1/-0)
.pc/startpar-upstart-tasks.patch/startpar/makeboot.c (+688/-0)
debian/changelog (+10/-0)
debian/patches/series (+1/-0)
debian/patches/startpar-upstart-tasks.patch (+28/-0)
debian/src/sysv-rc/etc/init.d/rc (+1/-3)
startpar/makeboot.c (+10/-1)
Branch information
- Owner:
- Dimitri John Ledkov
- Status:
- Development
Recent revisions
- 207. By Martin Pitt
-
Disable startpar. It wreaks havoc with "task" upstart jobs as init.d
scripts depending on them rely on them to be "running". - 205. By Dimitri John Ledkov
-
* Revert previous upload, which caused regression due to UPSTARTDIR
variable removal that was still in-use.
* Reintroduce 11 rcS initd scripts:
- all of them source /lib/lsb/init-functions and thus do nothing under
upstart, and symlinked to /dev/null under systemd.
- adjust initscripts conffiles, postinst and postrm to setup symlinks
and clean up appropriately.
* Enable insserv (LP: #1312836):
- adjust path variable in postinst to find insserv under
/usr/lib/insserv due to 200_hide_insserv_ on_ubuntu. patch in insserv on
ubuntu.
- adjust legacy_boot check to examine both rc0.d and rc6.d and the
stamp file.
- perform conversion and remove flag file
- cherrypick patch for update-rc.d to lookup insserv in
/usr/lib/insserv and /sbin.
- drop touching legacy boot ordering stamp in sysv-rc preinst. - 204. By Martin Pitt
-
Revert the invoke-rc.d check for "does this upstart job exist" from
calling "initctl status" back to checking for the file existence. The
former fails in a chroot if it installs a package/job which is not present
on the host: then "initctl status" will check the hosts's job (which
doesn't exist, and thus fails) instead of the one in the chroot. - 203. By Dimitri John Ledkov
-
* Cherrypick fixes from Debian git repository:
* service & invoke-rc.d: in upstart interfacing code, check that the job
is actually known to upstart. This is because during upgrades, pid 1
might still be an older upstart which may not yet support syntax of
the newly unpacked jobs, thus sysv-init script should be continued to
be used instead. (Closes: #745503)
* service & invoke-rc.d: unset UPSTART_SESSION environment variable to
make sure all upstart initctl commands are executed against system
init and not the session one. (Closes: #745505)
* service: in upstart interfacing code, map "force-reload" to restart as
per Debian policy 9.3.2, since there is no way to know for-sure if a
reload is supported.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/utopic/sysvinit