Merge lp:~ubuntu-core-dev/ubuntu/utopic/sysvinit/unreviewed into lp:ubuntu/utopic/sysvinit

[Dimitri John Ledkov]

[lp:~ubuntu-core-dev/ubuntu/utopic/sysvinit/unreviewed]

208. By Dimitri John Ledkov on 2014-05-19

   - adjust path variable in postinst to find insserv under
  /usr/lib/insserv
  - cherrypick patch for update-rc.d to lookup insserv in
  /usr/lib/insserv and /sbin.

209. By Dimitri John Ledkov on 2014-05-19

adjust legacy_boot check to examine both rc0.d and rc6.d and the
stamp file

[Steve Langasek (vorlon)]

On Mon, May 19, 2014 at 09:06:40AM -0000, Dimitri John Ledkov wrote:
> === modified file 'debian/initscripts.conffiles'
> --- debian/initscripts.conffiles 2013-05-17 06:03:10 +0000
> +++ debian/initscripts.conffiles 2014-05-19 09:06:30 +0000
> @@ -1,6 +1,17 @@
> +/etc/init.d/bootmisc.sh
> +/etc/init.d/checkfs.sh
> +/etc/init.d/checkroot.sh
> +/etc/init.d/checkroot-bootclean.sh
> /etc/init.d/halt
> +/etc/init.d/hostname.sh

Note that there is no /etc/init/hostname.sh.conf job at present, which means
this change will cause both /etc/init.d/hostname.sh and
/etc/init/hostname.conf to be run.

[Steve Langasek (vorlon)]

On Mon, May 19, 2014 at 09:06:40AM -0000, Dimitri John Ledkov wrote:
> @@ -1,3 +1,20 @@
> +sysvinit (2.88dsf-41ubuntu13) UNRELEASED; urgency=medium
> +
> + * Revert previous upload, but keep UPSTARTDIR defined which was still
> + used in the fallback codepath to specifically prevent configuration
> + issues in chroots.

What is the reason for this revert, which seems to me to be unrelated to the
rest of the changes? This seems like a lot of fuss for handling of upstart
jobs in a chroot, for which the right answer is almost always "install a
policy-rc.d that blocks all services from starting". Do we have a consensus
on what the right behavior is here if the host upstart does not support
chroot sessions, and no policy-rc.d is in place? Should invoke-rc.d error
out, or should it fall back to starting via the init script, which seem to
be the two options we're flipping between here?

> === modified file 'debian/control'
> --- debian/control 2013-05-17 06:03:10 +0000
> +++ debian/control 2014-05-19 09:06:30 +0000
> @@ -43,7 +43,8 @@
> Depends:
> ${misc:Depends},
> sysvinit-utils (>= 2.86.ds1-62),
> - insserv (>> 1.12.0-10)
> + insserv (>> 1.12.0-10),
> + initscripts (>= ${binary:Version})
> Breaks: initscripts (<< 2.86.ds1-63)
> Multi-Arch: foreign
> Description: System-V-like runlevel change mechanism

I don't understand this dependency addition. Maybe this is meant to be
initscripts (>= 2.88dsf-41ubuntu13), rather than initscripts (>=
${binary:Version}) ?

I notice when diffing against initscripts 2.88dsf-41 that there are some
init scripts that have not been re-added:

-/etc/init.d/bootlogs
-/etc/init.d/motd
-/etc/init.d/mtab.sh
-/etc/init.d/rmnologin

What's different about these?

> === modified file 'debian/initscripts.postinst'
> --- debian/initscripts.postinst 2013-05-17 06:03:10 +0000
> +++ debian/initscripts.postinst 2014-05-19 09:06:30 +0000
> @@ -140,6 +140,39 @@
> #
> # Links in runlevel S
> #
> +if [ -x /etc/init.d/mountkernfs.sh ]; then
> +update-rc.d mountkernfs.sh start 02 S . >/dev/null || exit $?
> +fi

<snip>

Per
<https://bugs.launchpad.net/ubuntu/+source/ifupdown/+bug/1312836/comments/7>,
we don't want to reintroduce the calls to update-rc.d until /after/ insserv
has been re-enabled and fully vetted (i.e., step 4 - drop the debhelper
change that causes update-rc.d to be skipped... this also applies to
sysvinit, even though sysvinit doesn't use the debhelper implementation.)

Also, please note that this postinst still contains a delta to call
update-rc.d *remove* immediately above your restored calls, which ought to
be dropped at the same time as restoring the code to add the links.

And the code in debian/initscripts.preinst which deletes these restored
initscripts definitely wants to be removed.

> === added file 'debian/src/initscripts/etc/init.d/bootmisc.sh'
> --- debian/src/initscripts/etc/init.d/bootmisc.sh 1970-01-01 00:00:00 +0000
> +++ debian/src/initscripts/etc/init.d/bootmisc.sh 2014-05-19 09:06:30 +0000
<snip>
> +# NB! on ubuntu this file is usually not used at all, as it's
> +# redundant under upstart or systemd. This file is purely introduced
> +# to enable insserv / systemd init.d s...

[Steve Langasek (vorlon)]

review: Needs Fixing

[Martin Pitt (pitti)]

Steve Langasek [2014-05-19 16:24 -0000]:
> Note that there is no /etc/init/hostname.sh.conf job at present,
> which means this change will cause both /etc/init.d/hostname.sh and
> /etc/init/hostname.conf to be run.

Debian has
http://anonscm.debian.org/gitweb/?p=collab-maint/sysvinit;a=commitdiff;h=0da7086
for this problem on the systemd side. So I guess we need the moral
equivalent for upstart?

[Martin Pitt (pitti)]

Steve Langasek [2014-05-20 1:12 -0000]:
> What is the reason for this revert, which seems to me to be unrelated to the
> rest of the changes? This seems like a lot of fuss for handling of upstart
> jobs in a chroot, for which the right answer is almost always "install a
> policy-rc.d that blocks all services from starting".

Please note that this isn't about actually starting services in a
chroot. Dimitri's intention was to replace the [ -e /etc/init/$JOB.conf ]
with "ask upstart if it knows about $JOB", and the first iteration was
"initctl status $JOB doesn't fail". That doesn't work due to what I
described in https://launchpad.net/ubuntu/+source/sysvinit/2.88dsf-41ubuntu12
but during our live builds we do have policy-rc.d, so we don't
actually start services.

So we either need a fallback like that (which isn't really correct
though), or maintain a list of possible job locations in invoke-rc.d
(like /lib/init/*.conf, /etc/upstart/overrides/*.conf, or whereever)

> Do we have a consensus on what the right behavior is here if the
> host upstart does not support chroot sessions, and no policy-rc.d is
> in place? Should invoke-rc.d error out, or should it fall back to
> starting via the init script, which seem to be the two options we're
> flipping between here?

I don't have a strong opinion about either way, but my gut feeling is
that it's more predictable to just not start anything at all if the
host upstart doesn't support chroot mode.

> > +# NB! on ubuntu this file is usually not used at all, as it's
> > +# redundant under upstart or systemd. This file is purely introduced
> > +# to enable insserv / systemd init.d scripts activation
> > +. /lib/lsb/init-functions
>
> IMHO the benefit of this expository comment is outweighed by the detriment
> of having the extra delta in these scripts; but that's just my opinion.

+1

Thanks,
Martin
--
Martin Pitt | http://www.piware.de
Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)

[Steve Langasek (vorlon)]

On Tue, May 20, 2014 at 06:33:19AM -0000, Martin Pitt wrote:
> Debian has
> http://anonscm.debian.org/gitweb/?p=collab-maint/sysvinit;a=commitdiff;h=0da7086
> for this problem on the systemd side. So I guess we need the moral
> equivalent for upstart?

The use of '.sh' extensions for init scripts is deprecated, and there is a
small and finite set that need to be handled. Furthermore, mapping these
job names would need to be done in C for upstart (since it's startpar that
provides the bridging at boot time), and not all of the .sh init scripts
could be handled as direct translations due to differences in the job
lifecycles (services vs. tasks in upstart). So the solution here is just to
provide the missing /etc/init/hostname.sh.conf wrapper job, to go with the
other wrapper jobs that mountall is already providing.

[Dimitri John Ledkov (xnox)]

> On Mon, May 19, 2014 at 09:06:40AM -0000, Dimitri John Ledkov wrote:
> > @@ -1,3 +1,20 @@
> > +sysvinit (2.88dsf-41ubuntu13) UNRELEASED; urgency=medium
> > +
> > + * Revert previous upload, but keep UPSTARTDIR defined which was still
> > + used in the fallback codepath to specifically prevent configuration
> > + issues in chroots.
>
> What is the reason for this revert, which seems to me to be unrelated to the
> rest of the changes? This seems like a lot of fuss for handling of upstart
> jobs in a chroot, for which the right answer is almost always "install a
> policy-rc.d that blocks all services from starting". Do we have a consensus
> on what the right behavior is here if the host upstart does not support
> chroot sessions, and no policy-rc.d is in place? Should invoke-rc.d error
> out, or should it fall back to starting via the init script, which seem to
> be the two options we're flipping between here?
>

Basically 2.88dsf-41ubuntu11 undefined UPSTARTDIR variable, yet it was still in use

285 if [ ! -e "$UPSTARTDIR/${INITSCRIPTID}.conf" ]; then
286 # If the init script doesn't exist, but the upstart job does, we
287 # defer the error exit; we might be running in a chroot and
288 # policy-rc.d might say not to start the job anyway, in which case
289 # we don't want to exit non-zero.
290 exit 100
291 fi

Thus 2.88dsf-41ubuntu12 revert was uploaded to resolve the regression as soon as possible (it was already in utopic release pocket).

I guess to be more clear this portion of the commit could be:

-UPSTARTDIR=/etc/init/

- && [ -e "$UPSTARTDIR/${INITSCRIPTID}.conf" ]
+ && initctl status ${INITSCRIPTID} 1>/dev/null 2>/dev/null

- if [ ! -e "$UPSTARTDIR/${INITSCRIPTID}.conf" ]; then
+ if [ ! -e "/etc/init/${INITSCRIPTID}.conf" ]; then

Or I can upload it separately.

> > === modified file 'debian/control'
> > --- debian/control 2013-05-17 06:03:10 +0000
> > +++ debian/control 2014-05-19 09:06:30 +0000
> > @@ -43,7 +43,8 @@
> > Depends:
> > ${misc:Depends},
> > sysvinit-utils (>= 2.86.ds1-62),
> > - insserv (>> 1.12.0-10)
> > + insserv (>> 1.12.0-10),
> > + initscripts (>= ${binary:Version})
> > Breaks: initscripts (<< 2.86.ds1-63)
> > Multi-Arch: foreign
> > Description: System-V-like runlevel change mechanism
>
> I don't understand this dependency addition. Maybe this is meant to be
> initscripts (>= 2.88dsf-41ubuntu13), rather than initscripts (>=
> ${binary:Version}) ?
>

Yes, it's meant to be the first version of initscripts that re-introduces these initscripts. If no other uploads ...

[Dimitri John Ledkov (xnox)]

> On Mon, May 19, 2014 at 09:06:40AM -0000, Dimitri John Ledkov wrote:
> > === modified file 'debian/initscripts.conffiles'
> > --- debian/initscripts.conffiles 2013-05-17 06:03:10 +0000
> > +++ debian/initscripts.conffiles 2014-05-19 09:06:30 +0000
> > @@ -1,6 +1,17 @@
> > +/etc/init.d/bootmisc.sh
> > +/etc/init.d/checkfs.sh
> > +/etc/init.d/checkroot.sh
> > +/etc/init.d/checkroot-bootclean.sh
> > /etc/init.d/halt
> > +/etc/init.d/hostname.sh
>
> Note that there is no /etc/init/hostname.sh.conf job at present, which means
> this change will cause both /etc/init.d/hostname.sh and
> /etc/init/hostname.conf to be run.

My bad, I had locally hostname.sh.conf from when I wrote patch to get it included in debian. Will fix this.

[Dimitri John Ledkov (xnox)]

> On Tue, May 20, 2014 at 06:33:19AM -0000, Martin Pitt wrote:
> > Debian has
> > http://anonscm.debian.org/gitweb/?p=collab-
> maint/sysvinit;a=commitdiff;h=0da7086
> > for this problem on the systemd side. So I guess we need the moral
> > equivalent for upstart?
>
> The use of '.sh' extensions for init scripts is deprecated, and there is a
> small and finite set that need to be handled. Furthermore, mapping these
> job names would need to be done in C for upstart (since it's startpar that
> provides the bridging at boot time), and not all of the .sh init scripts
> could be handled as direct translations due to differences in the job
> lifecycles (services vs. tasks in upstart). So the solution here is just to
> provide the missing /etc/init/hostname.sh.conf wrapper job, to go with the
> other wrapper jobs that mountall is already providing.

My understanding is that in above commit it has to drop .sh suffix, because systemd drops .sh suffix from init-scripts when it inventories them into units. But, I would have expected systemd to also add ".sh" alias to those units & all the systemctl commands to still work with either names...

[lp:~ubuntu-core-dev/ubuntu/utopic/sysvinit/unreviewed]

210. By Dimitri John Ledkov on 2014-05-21

Revert previous upload, which caused regression due to UPSTARTDIR
variable removal that was still in-use.

211. By Dimitri John Ledkov on 2014-05-21

Clarify usr/lib/insserv path change.

212. By Dimitri John Ledkov on 2014-05-21

Finalise initscripts package version that will re-introduce dropped initscripts.

213. By Dimitri John Ledkov on 2014-05-21

Reduce diff with debian. Drop mount-functions.sh sourcing, not available on ubuntu.

214. By Dimitri John Ledkov on 2014-05-21

drop touching legacy boot ordering stamp in sysv-rc preinst.

[Steve Langasek (vorlon)]

On Wed, May 21, 2014 at 02:26:50PM -0000, Dimitri John Ledkov wrote:
> Thus 2.88dsf-41ubuntu12 revert was uploaded to resolve the regression as
> soon as possible (it was already in utopic release pocket).

> I guess to be more clear this portion of the commit could be:

> -UPSTARTDIR=/etc/init/

> - && [ -e "$UPSTARTDIR/${INITSCRIPTID}.conf" ]
> + && initctl status ${INITSCRIPTID} 1>/dev/null 2>/dev/null

> - if [ ! -e "$UPSTARTDIR/${INITSCRIPTID}.conf" ]; then
> + if [ ! -e "/etc/init/${INITSCRIPTID}.conf" ]; then

> Or I can upload it separately.

Fine with me for it to be included, now that I understand.

> > > === modified file 'debian/control'
> > > --- debian/control 2013-05-17 06:03:10 +0000
> > > +++ debian/control 2014-05-19 09:06:30 +0000
> > > @@ -43,7 +43,8 @@
> > > Depends:
> > > ${misc:Depends},
> > > sysvinit-utils (>= 2.86.ds1-62),
> > > - insserv (>> 1.12.0-10)
> > > + insserv (>> 1.12.0-10),
> > > + initscripts (>= ${binary:Version})
> > > Breaks: initscripts (<< 2.86.ds1-63)
> > > Multi-Arch: foreign
> > > Description: System-V-like runlevel change mechanism
> >
> > I don't understand this dependency addition. Maybe this is meant to be
> > initscripts (>= 2.88dsf-41ubuntu13), rather than initscripts (>=
> > ${binary:Version}) ?

> Yes, it's meant to be the first version of initscripts that re-introduces
> these initscripts. If no other uploads happen in the mean time it will
> become 2.88dsf-41ubuntu13.

Ok, please don't forget to change it. :)

> > I notice when diffing against initscripts 2.88dsf-41 that there are some
> > init scripts that have not been re-added:
> >
> > -/etc/init.d/bootlogs
> > -/etc/init.d/motd
> > -/etc/init.d/mtab.sh
> > -/etc/init.d/rmnologin
> >
> > What's different about these?

> I think they are not used on ubuntu, and are irrelevant under upstart or
> systemd boot, and not required to enable insserv.

<snip>

> I don't see a point in introducing those + dummy systemd units symlinking to /dev/null + dummy upstart jobs.

Makes sense, thanks.

> > > === modified file 'debian/initscripts.postinst'
> > > --- debian/initscripts.postinst 2013-05-17 06:03:10 +0000
> > > +++ debian/initscripts.postinst 2014-05-19 09:06:30 +0000
> > > @@ -140,6 +140,39 @@
> > > #
> > > # Links in runlevel S
> > > #
> > > +if [ -x /etc/init.d/mountkernfs.sh ]; then
> > > +update-rc.d mountkernfs.sh start 02 S . >/dev/null || exit $?
> > > +fi

> > <snip>

> > Per
> > <https://bugs.launchpad.net/ubuntu/+source/ifupdown/+bug/1312836/comments/7>,
> > we don't want to reintroduce the calls to update-rc.d until /after/ insserv
> > has been re-enabled and fully vetted (i.e., step 4 - drop the debhelper
> > change that causes update-rc.d to be skipped... this also applies to
> > sysvinit, even though sysvinit doesn't use the debhelper implementation.)

> However sysvinit & these scripts are special. Even with update-rc.d, they
> do nothing =) under systemd they are symlinked to /dev/null & under
> upstart they simply start compat jobs which have no body / processes.

That's only true if you have a versioned dependency on the version of
upstart that introduces the init-funct...

[Martin Pitt (pitti)]

This just merely changes the order and is noise (in debian/initscripts.preinst):

180 + eliminate_conffile "/etc/init.d/mountoverflowtmp"
181 eliminate_conffile "/etc/init.d/rmnologin"
182 eliminate_conffile "/etc/init.d/mtab.sh"
183 - eliminate_conffile "/etc/init.d/mountoverflowtmp"

invoke-rc.d:

1365 if which initctl >/dev/null && initctl version 2>/dev/null | grep -q upstart \
1366 - && [ -e "$UPSTARTDIR/${INITSCRIPTID}.conf" ]
1367 + && initctl status ${INITSCRIPTID} 1>/dev/null 2>/dev/null

This changes behaviour in chroots: If the host system is running upstart, the chroot has /etc/init/$INITSCRIPTID.conf, but the host doesn't, then in the current code this would still try and use upstart. With this MP this will then be false as the host upstart doesn't know about a job named ${INITSCRIPTID}. There is a fallback later in the code, we just need to be extra-sure that this is really the behaviour that we want. It might still be safer to just explicitly enumerate all possible locations for an upstart job? (NB, I haven't really understood yet how upstart's chroot support works).

The rest looks fine to me (thanks for your further explanations about the .legacy-bootordering check etc.). Thanks for working on this!

review: Approve

[Martin Pitt (pitti)]

I built and installed this into a relatively clean utopic VM.

  /rc/rc?.d/ before: http://paste.ubuntu.com/7519546/
  /rc/rc?.d/ after: http://paste.ubuntu.com/7519547/

I can't do the comparison on my workstation as I already ran insserv a few weeks ago manually (without this branch and the init.d scripts added back); I also didn't notice any problems since then.

I did a few reboot and powerdown/boot tests without obvious failures, but it seems prudent to look into the details as many of the scripts' effects are not immediately obvious. I looked at the differences in above pastebins:

= rc[2345].d =

The order changed a bit, but only for scripts which don't depend on each other. insserv tends to sort the scripts without/with fewer dependencies like dns-clean first, which makes sense. rc.local is still correctly the last item.

= rc[06].d =
This looks a bit odd. In the original "legacy" ordering we had

lrwxrwxrwx 1 root root 18 Mej 25 13:20 S20sendsigs -> ../init.d/sendsigs
lrwxrwxrwx 1 root root 17 Mej 25 13:20 S30urandom -> ../init.d/urandom
lrwxrwxrwx 1 root root 22 Mej 25 13:20 S31umountnfs.sh -> ../init.d/umountnfs.sh
lrwxrwxrwx 1 root root 18 Mej 25 13:20 S40umountfs -> ../init.d/umountfs
lrwxrwxrwx 1 root root 20 Mej 25 13:20 S60umountroot -> ../init.d/umountroot
lrwxrwxrwx 1 root root 14 Mej 25 13:20 S90halt -> ../init.d/halt

but these got turned into "K" links like

lrwxrwxrwx 1 root root 20 Mej 26 09:48 K01kerneloops -> ../init.d/kerneloops
lrwxrwxrwx 1 root root 15 Mej 26 09:48 K01rsync -> ../init.d/rsync
lrwxrwxrwx 1 root root 27 Mej 26 09:48 K01speech-dispatcher -> ../init.d/speech
-dispatcher

won't that change the semantics? (being called with "stop" instead of "start", etc.)

= rc1.d =

Looks fine

= rcS.d =

As expected we now have the ~ 11 scripts there which got introduced merely for ordering reason, they should be no-ops. Our 4 original links are still there in a reasonable order.

So we should investigate the S → K change for 0/6, otherwise this looks good.

[Steve Langasek (vorlon)]

On Mon, May 26, 2014 at 08:09:43AM -0000, Martin Pitt wrote:

> So we should investigate the S → K change for 0/6, otherwise this looks
> good.

This is the expected behavior. All scripts in /etc/rc[06].d were already
called with 'stop' as the argument, regardless of the link name. See this
section of /etc/init.d/rc:

# Is there an rc directory for this new runlevel?
if [ -d /etc/rc$runlevel.d ]
then
        case "$runlevel" in
                0|6)
                        ACTION=stop
                        ;;
                S)
                        ACTION=start
                        ;;
                *)
                        ACTION=start
                        ;;
        esac

[...]

So this is not a behavior change.

[Martin Pitt (pitti)]

Thanks Steve, Dimitri and I were just reading /etc/init.d/rc etc. to convince ourselves. It's running on my work station as well now. So from my POV I'm fully happy to land this now. Do you still have any reservations about this?

review: Approve

[Steve Langasek (vorlon)]

My approval is conditional on having these previous comments addressed:

 - verifying that there are no other packages whose init scripts are missing (dropped from Debian) before flipping the switch on insserv
 - versioned dependency on upstart for the init-functions.d hook, or other method to ensure that the restored init scripts are not enabled in /etc/rcS.d in a scenario that would cause them to be run on Ubuntu (even due to a partial upgrade)
 - fixing the versioned dependency to use the real version, not ${binary:Version}

[Martin Pitt (pitti)]

On Steve's first point I reviewed lp:~upstart-devel/upstart/upstart-jobs. There are 142 init.d scripts which are in sid but not in utopic:

$ for f in `ls sid/etc/init.d/`; do [ -e utopic/etc/init.d/$f ] || echo $f; done

We can also exclude the bunch which this MP adds, leaving us with 130:

$ for f in `ls sid/etc/init.d/`; do [ -e utopic/etc/init.d/$f ] || [ -e /etc/init.d/$f ] || echo $f; done > missing-init.d⎵

The majority of these are from cloud-init, openstack (cinder, neutron, nova, swift, etc.) where we never merged with Debian.

Checking which Ubuntu init.d scripts have dependencies to init.d scripts which are in Debian, but not in Ubuntu:

$ for f in $(< missing-init.d); do echo "=== $f ===="; egrep -ir "(-start|-stop):.*$f" utopic/etc/init.d/; done|less

output: http://paste.ubuntu.com/7520913/

Thus we need to fix some 14 packages/scripts.

[Martin Pitt (pitti)]

I created bug 1323274 to track the missing init.d scripts.

[lp:~ubuntu-core-dev/ubuntu/utopic/sysvinit/unreviewed]

215. By Dimitri John Ledkov on 2014-05-26

Add versioned upstart dependency on the lsb-hook

216. By Dimitri John Ledkov on 2014-05-26

minimise diff

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-16 10:27:06 +0000
+++ debian/changelog	2014-05-26 13:01:48 +0000
@@ -1,3 +1,25 @@
+sysvinit (2.88dsf-41ubuntu13) UNRELEASED; urgency=medium
+
+  * 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.
+
+ -- Dimitri John Ledkov <[e-mail]>  Sun, 18 May 2014 22:10:00 +0100
+
 sysvinit (2.88dsf-41ubuntu12) utopic; urgency=medium
 
   * Revert the invoke-rc.d check for "does this upstart job exist" from
 
=== modified file 'debian/control'
--- debian/control	2013-05-17 06:03:10 +0000
+++ debian/control	2014-05-26 13:01:48 +0000
@@ -43,7 +43,8 @@
 Depends:
  ${misc:Depends},
  sysvinit-utils (>= 2.86.ds1-62),
- insserv (>> 1.12.0-10)
+ insserv (>> 1.12.0-10),
+ initscripts (>= 2.88dsf-41ubuntu13)
 Breaks: initscripts (<< 2.86.ds1-63)
 Multi-Arch: foreign
 Description: System-V-like runlevel change mechanism
@@ -60,7 +61,7 @@
  sysvinit-utils (>= 2.86.ds1-64), sysv-rc | file-rc,
  coreutils (>= 5.93),
  passwd,
- upstart,
+ upstart (>= 1.12.1-0ubuntu6),
  mountall (>= 2.28)
 Recommends: psmisc, e2fsprogs
 Conflicts:
 
=== modified file 'debian/initscripts.conffiles'
--- debian/initscripts.conffiles	2013-05-17 06:03:10 +0000
+++ debian/initscripts.conffiles	2014-05-26 13:01:48 +0000
@@ -1,6 +1,17 @@
+/etc/init.d/bootmisc.sh
+/etc/init.d/checkfs.sh
+/etc/init.d/checkroot.sh
+/etc/init.d/checkroot-bootclean.sh
 /etc/init.d/halt
+/etc/init.d/hostname.sh
 /etc/init.d/killprocs
 /etc/init.d/ondemand
+/etc/init.d/mountall.sh
+/etc/init.d/mountall-bootclean.sh
+/etc/init.d/mountnfs.sh
+/etc/init.d/mountnfs-bootclean.sh
+/etc/init.d/mountdevsubfs.sh
+/etc/init.d/mountkernfs.sh
 /etc/init.d/rc.local
 /etc/init.d/reboot
 /etc/init.d/sendsigs
 
=== modified file 'debian/initscripts.postinst'
--- debian/initscripts.postinst	2013-05-17 06:03:10 +0000
+++ debian/initscripts.postinst	2014-05-26 13:01:48 +0000
@@ -112,22 +112,12 @@
     fi
 fi
 
-# In 2.87dsf-4ubuntu2, we begin migrating to Upstart jobs, so all of
-# these get removed.
+# In 2.87dsf-4ubuntu2, we begin migrating to Upstart jobs, remove all
+# those that got removed and not subsequently re-introduced to enable
+# insserv.
 if dpkg --compare-versions "$PREV_VER" le-nl "2.87dsf-4ubuntu2"
 then
-	update-rc.d -f hostname.sh remove >/dev/null 2>&1 || :
-	update-rc.d -f mountkernfs.sh remove >/dev/null 2>&1 || :
-	update-rc.d -f mountdevsubfs.sh remove >/dev/null 2>&1 || :
-	update-rc.d -f checkroot.sh remove >/dev/null 2>&1 || :
 	update-rc.d -f mtab.sh remove >/dev/null 2>&1 || :
-	update-rc.d -f checkfs.sh remove >/dev/null 2>&1 || :
-	update-rc.d -f mountall.sh remove >/dev/null 2>&1 || :
-	update-rc.d -f mountall-bootclean.sh remove >/dev/null 2>&1 || :
-	update-rc.d -f mountoverflowtmp remove >/dev/null 2>&1 || :
-	update-rc.d -f mountnfs.sh remove >/dev/null 2>&1 || :
-	update-rc.d -f mountnfs-bootclean.sh remove >/dev/null 2>&1 || :
-	update-rc.d -f bootmisc.sh remove >/dev/null 2>&1 || :
 	update-rc.d -f bootlogs remove >/dev/null 2>&1 || :
 	update-rc.d -f rmnologin remove >/dev/null 2>&1 || :
 fi
@@ -140,6 +130,39 @@
 #
 # Links in runlevel S
 #
+if [ -x /etc/init.d/mountkernfs.sh ]; then
+update-rc.d mountkernfs.sh         start 02 S . >/dev/null || exit $?
+fi
+if [ -x /etc/init.d/hostname.sh ]; then
+update-rc.d hostname.sh            start 02 S . >/dev/null || exit $?
+fi
+if [ -x /etc/init.d/mountdevsubfs.sh ]; then
+update-rc.d mountdevsubfs.sh       start 04 S . >/dev/null || exit $?
+fi
+if [ -x /etc/init.d/checkroot.sh ]; then
+update-rc.d checkroot.sh           start 10 S . >/dev/null || exit $?
+fi
+if [ -x /etc/init.d/checkroot-bootclean.sh ]; then
+update-rc.d checkroot-bootclean.sh start 13 S . >/dev/null || exit $?
+fi
+if [ -x /etc/init.d/checkfs.sh ]; then
+update-rc.d checkfs.sh             start 30 S . >/dev/null || exit $?
+fi
+if [ -x /etc/init.d/mountall.sh ]; then
+update-rc.d mountall.sh            start 35 S . >/dev/null || exit $?
+fi
+if [ -x /etc/init.d/mountall-bootclean.sh ]; then
+update-rc.d mountall-bootclean.sh  start 36 S . >/dev/null || exit $?
+fi
+if [ -x /etc/init.d/mountnfs.sh ]; then
+update-rc.d mountnfs.sh            start 45 S . >/dev/null || exit $?
+fi
+if [ -x /etc/init.d/mountnfs-bootclean.sh ]; then
+update-rc.d mountnfs-bootclean.sh  start 46 S . >/dev/null || exit $?
+fi
+if [ -x /etc/init.d/bootmisc.sh ]; then
+update-rc.d bootmisc.sh            start 55 S . >/dev/null || exit $?
+fi
 if [ -x /etc/init.d/urandom ]; then
 update-rc.d urandom                start 55 S . start 30 0 6 . >/dev/null || exit $?
 fi
 
=== modified file 'debian/initscripts.postrm'
--- debian/initscripts.postrm	2013-05-17 06:03:10 +0000
+++ debian/initscripts.postrm	2014-05-26 13:01:48 +0000
@@ -57,6 +57,17 @@
 	update-rc.d reboot                 remove >/dev/null || exit $?
 	update-rc.d halt                   remove >/dev/null || exit $?
 	update-rc.d urandom                remove >/dev/null || exit $?
+	update-rc.d bootmisc.sh            remove >/dev/null || exit $?
+	update-rc.d mountnfs-bootclean.sh  remove >/dev/null || exit $?
+	update-rc.d mountnfs.sh            remove >/dev/null || exit $?
+	update-rc.d mountall-bootclean.sh  remove >/dev/null || exit $?
+	update-rc.d mountall.sh            remove >/dev/null || exit $?
+	update-rc.d checkfs.sh             remove >/dev/null || exit $?
+	update-rc.d checkroot-bootclean.sh remove >/dev/null || exit $?
+	update-rc.d checkroot.sh           remove >/dev/null || exit $?
+	update-rc.d mountdevsubfs.sh       remove >/dev/null || exit $?
+	update-rc.d hostname.sh            remove >/dev/null || exit $?
+	update-rc.d mountkernfs.sh         remove >/dev/null || exit $?
 
 	# Remove /dev/pts and /dev/shm ?
 	;;
 
=== modified file 'debian/initscripts.preinst'
--- debian/initscripts.preinst	2013-05-17 19:02:36 +0000
+++ debian/initscripts.preinst	2014-05-26 13:01:48 +0000
@@ -153,24 +153,15 @@
 	    esac
 	fi
 	#
-	# Removed as we switched to Upstart
+	# Removed as we switched to Upstart, and didn't reintroduce
+	# them for insserv compatiblity.
 	#
 	if [ "$2" ] && dpkg --compare-versions "$2" lt "2.87dsf-4ubuntu6"; then
 		eliminate_conffile "/etc/network/if-up.d/mountnfs"
 		eliminate_conffile "/etc/init.d/bootlogs"
-		eliminate_conffile "/etc/init.d/checkfs.sh"
-		eliminate_conffile "/etc/init.d/checkroot.sh"
-		eliminate_conffile "/etc/init.d/mountkernfs.sh"
-		eliminate_conffile "/etc/init.d/hostname.sh"
-		eliminate_conffile "/etc/init.d/bootmisc.sh"
-		eliminate_conffile "/etc/init.d/mountall.sh"
-		eliminate_conffile "/etc/init.d/mountdevsubfs.sh"
 		eliminate_conffile "/etc/init.d/rmnologin"
 		eliminate_conffile "/etc/init.d/mtab.sh"
 		eliminate_conffile "/etc/init.d/mountoverflowtmp"
-		eliminate_conffile "/etc/init.d/mountnfs.sh"
-		eliminate_conffile "/etc/init.d/mountnfs-bootclean.sh"
-		eliminate_conffile "/etc/init.d/mountall-bootclean.sh"
 	fi
 	#
 	# A final straggler from the upstart conversion
 
=== added file 'debian/src/initscripts/etc/init.d/bootmisc.sh'
--- debian/src/initscripts/etc/init.d/bootmisc.sh	1970-01-01 00:00:00 +0000
+++ debian/src/initscripts/etc/init.d/bootmisc.sh	2014-05-26 13:01:48 +0000
@@ -0,0 +1,61 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          bootmisc
+# Required-Start:    $remote_fs
+# Required-Stop:
+# Should-Start:      udev
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Miscellaneous things to be done during bootup.
+# Description:       Some cleanup.  Note, it need to run after mountnfs-bootclean.sh.
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+[ "$DELAYLOGIN" ] || DELAYLOGIN=yes
+. /lib/init/vars.sh
+
+do_start () {
+	#
+	# If login delaying is enabled then create the flag file
+	# which prevents logins before startup is complete
+	#
+	case "$DELAYLOGIN" in
+	  Y*|y*)
+		echo "System bootup in progress - please wait" > /var/lib/initscripts/nologin
+		;;
+	esac
+
+	# Create /var/run/utmp so we can login.
+	: > /var/run/utmp
+	if grep -q ^utmp: /etc/group
+	then
+		chmod 664 /var/run/utmp
+		chgrp utmp /var/run/utmp
+	fi
+
+	# Remove bootclean's flag files.
+	# Don't run bootclean again after this!
+	rm -f /tmp/.clean /run/.clean /run/lock/.clean
+	rm -f /tmp/.tmpfs /run/.tmpfs /run/lock/.tmpfs
+}
+
+case "$1" in
+  start|"")
+	do_start
+	;;
+  restart|reload|force-reload)
+	echo "Error: argument '$1' not supported" >&2
+	exit 3
+	;;
+  stop|status)
+	# No-op
+	;;
+  *)
+	echo "Usage: bootmisc.sh [start|stop]" >&2
+	exit 3
+	;;
+esac
+
+:
 
=== added file 'debian/src/initscripts/etc/init.d/checkfs.sh'
--- debian/src/initscripts/etc/init.d/checkfs.sh	1970-01-01 00:00:00 +0000
+++ debian/src/initscripts/etc/init.d/checkfs.sh	2014-05-26 13:01:48 +0000
@@ -0,0 +1,154 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          checkfs
+# Required-Start:    checkroot
+# Required-Stop:
+# Should-Start:
+# Default-Start:     S
+# Default-Stop:
+# X-Interactive:     true
+# Short-Description: Check all filesystems.
+### END INIT INFO
+
+# Include /usr/bin in path to find on_ac_power if /usr/ is on the root
+# partition.
+PATH=/sbin:/bin:/usr/bin
+FSCK_LOGFILE=/var/log/fsck/checkfs
+[ "$FSCKFIX" ] || FSCKFIX=no
+. /lib/init/vars.sh
+
+. /lib/lsb/init-functions
+. /lib/init/swap-functions.sh
+
+do_start () {
+	# Trap SIGINT so that we can handle user interupt of fsck.
+	trap "" INT
+
+	# See if we're on AC Power.  If not, we're not gonna run our
+	# check.  If on_ac_power (in /usr/) is unavailable, behave as
+	# before and check all file systems needing it.
+
+# Disabled AC power check until fsck can be told to only check the
+# file system if it is corrupt when running on battery. (bug #526398)
+#	if which on_ac_power >/dev/null 2>&1
+#	then
+#		on_ac_power >/dev/null 2>&1
+#		if [ $? -eq 1 ]
+#		then
+#			[ "$VERBOSE" = no ] || log_success_msg "Running on battery power, so skipping file system check."
+#			BAT=yes
+#		fi
+#	fi
+	BAT=""
+	fscheck="yes"
+
+	if is_fastboot_active
+	then
+		[ "$fscheck" = yes ] && log_warning_msg "Fast boot enabled, so skipping file system check."
+		fscheck=no
+	fi
+
+	#
+	# Check the rest of the file systems.
+	#
+	if [ "$fscheck" = yes ] && [ ! "$BAT" ] && [ "$FSCKTYPES" != "none" ]
+	then
+
+		# Execute swapon command again, in case there are lvm
+		# or md swap partitions.  fsck can suck RAM.
+		swaponagain 'lvm and md'
+
+		if [ -f /forcefsck ] || grep -q -s -w -i "forcefsck" /proc/cmdline
+		then
+			force="-f"
+		else
+			force=""
+		fi
+		if [ "$FSCKFIX" = yes ]
+		then
+			fix="-y"
+		else
+			fix="-a"
+		fi
+		spinner="-C"
+		case "$TERM" in
+		  dumb|network|unknown|"")
+			spinner=""
+			;;
+		esac
+		[ "$(uname -m)" = s390x ] && spinner=""  # This should go away
+		FSCKTYPES_OPT=""
+		[ "$FSCKTYPES" ] && FSCKTYPES_OPT="-t $FSCKTYPES"
+		handle_failed_fsck() {
+			log_failure_msg "File system check failed. 
+A log is being saved in ${FSCK_LOGFILE} if that location is writable. 
+Please repair the file system manually."
+			log_warning_msg "A maintenance shell will now be started. 
+CONTROL-D will terminate this shell and resume system boot."
+			# Start a single user shell on the console
+			if ! sulogin $CONSOLE
+			then
+				log_failure_msg "Attempt to start maintenance shell failed. 
+Continuing with system boot in 5 seconds."
+				sleep 5
+			fi
+		}
+		if [ "$VERBOSE" = no ]
+		then
+			log_action_begin_msg "Checking file systems"
+			logsave -s $FSCK_LOGFILE fsck $spinner -R -A $fix $force $FSCKTYPES_OPT
+			FSCKCODE=$?
+
+			if [ "$FSCKCODE" -eq 32 ]
+			then
+				log_action_end_msg 1 "code $FSCKCODE"
+				log_warning_msg "File system check was interrupted by user"
+			elif [ "$FSCKCODE" -gt 1 ]
+			then
+				log_action_end_msg 1 "code $FSCKCODE"
+				handle_failed_fsck
+			else
+				log_action_end_msg 0
+			fi
+		else
+			if [ "$FSCKTYPES" ]
+			then
+				log_action_msg "Will now check all file systems of types $FSCKTYPES"
+			else
+				log_action_msg "Will now check all file systems"
+			fi
+			logsave -s $FSCK_LOGFILE fsck $spinner -V -R -A $fix $force $FSCKTYPES_OPT
+			FSCKCODE=$?
+			if [ "$FSCKCODE" -eq 32 ]
+			then
+				log_warning_msg "File system check was interrupted by user"
+			elif [ "$FSCKCODE" -gt 1 ]
+			then
+				handle_failed_fsck
+			else
+				log_success_msg "Done checking file systems. 
+A log is being saved in ${FSCK_LOGFILE} if that location is writable."
+			fi
+		fi
+	fi
+	rm -f /fastboot /forcefsck 2>/dev/null
+}
+
+case "$1" in
+  start|"")
+	do_start
+	;;
+  restart|reload|force-reload)
+	echo "Error: argument '$1' not supported" >&2
+	exit 3
+	;;
+  stop|status)
+	# No-op
+	;;
+  *)
+	echo "Usage: checkfs.sh [start|stop]" >&2
+	exit 3
+	;;
+esac
+
+:
 
=== added file 'debian/src/initscripts/etc/init.d/checkroot-bootclean.sh'
--- debian/src/initscripts/etc/init.d/checkroot-bootclean.sh	1970-01-01 00:00:00 +0000
+++ debian/src/initscripts/etc/init.d/checkroot-bootclean.sh	2014-05-26 13:01:48 +0000
@@ -0,0 +1,44 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          checkroot-bootclean
+# Required-Start:    checkroot
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+# X-Start-Before:    bootmisc
+# Short-Description: bootclean after checkroot.
+# Description:       Clean temporary filesystems after
+#                    the root filesystem has been mounted.
+#                    At this point, directories which may be
+#                    masked by future mounts may be cleaned.
+### END INIT INFO
+
+. /lib/lsb/init-functions
+. /lib/init/bootclean.sh
+
+case "$1" in
+  start|"")
+	# Clean /tmp, /run and /run/lock.  Remove the .clean files to
+	# force initial cleaning.  This is intended to allow cleaning
+	# of directories masked by mounts while the system was
+	# previously running, which would otherwise prevent them being
+	# cleaned.
+	rm -f /tmp/.clean /run/.clean /run/lock/.clean
+
+	clean_all
+	exit $?
+	;;
+  restart|reload|force-reload)
+	echo "Error: argument '$1' not supported" >&2
+	exit 3
+	;;
+  stop|status)
+	# No-op
+	;;
+  *)
+	echo "Usage: checkroot-bootclean.sh [start|stop]" >&2
+	exit 3
+	;;
+esac
+
+:
 
=== added file 'debian/src/initscripts/etc/init.d/checkroot.sh'
--- debian/src/initscripts/etc/init.d/checkroot.sh	1970-01-01 00:00:00 +0000
+++ debian/src/initscripts/etc/init.d/checkroot.sh	2014-05-26 13:01:48 +0000
@@ -0,0 +1,364 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          checkroot mtab
+# Required-Start:    mountdevsubfs hostname
+# Required-Stop:     
+# Should-Start:      keymap hwclockfirst hdparm bootlogd
+# Should-stop:
+# Default-Start:     S
+# Default-Stop:
+# X-Interactive:     true
+# Short-Description: Check to root file system.
+### END INIT INFO
+
+# Include /usr/bin in path to find on_ac_power if /usr/ is on the root
+# partition.
+PATH=/sbin:/bin:/usr/bin
+FSCK_LOGFILE=/var/log/fsck/checkroot
+[ "$FSCKFIX" ] || FSCKFIX=no
+[ "$SULOGIN" ] || SULOGIN=no
+. /lib/init/vars.sh
+
+. /lib/lsb/init-functions
+
+do_start () {
+	# Trap SIGINT so that we can handle user interrupt of fsck.
+	trap "" INT
+
+	#
+	# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to
+	# be spawned from this script *before anything else* with a timeout,
+	# like sysv does.
+	#
+	[ "$SULOGIN" = yes ] && sulogin -t 30 $CONSOLE
+
+	KERNEL="$(uname -s)"
+	MACHINE="$(uname -m)"
+
+	read_fstab
+
+	#
+	# Activate the swap device(s) in /etc/fstab. This needs to be done
+	# before fsck, since fsck can be quite memory-hungry.
+	#
+	ENABLE_SWAP=no
+	case "$KERNEL" in
+	  Linux)
+	  	if [ "$NOSWAP" = yes ]
+		then
+			[ "$VERBOSE" = no ] || log_warning_msg "Not activating swap as requested via bootoption noswap."
+			ENABLE_SWAP=no
+		else
+			if [ "$swap_on_lv" = yes ]
+			then
+				[ "$VERBOSE" = no ] || log_warning_msg "Not activating swap on logical volume."
+			elif [ "$swap_on_file" = yes ]
+			then
+				[ "$VERBOSE" = no ] || log_warning_msg "Not activating swap on swapfile."
+			else
+				ENABLE_SWAP=yes
+			fi
+		fi
+		;;
+	  *)
+		ENABLE_SWAP=yes
+		;;
+	esac
+	if [ "$ENABLE_SWAP" = yes ]
+	then
+		if [ "$VERBOSE" = no ]
+		then
+			log_action_begin_msg "Activating swap"
+			swapon -a -e >/dev/null 2>&1
+			log_action_end_msg $?
+		else
+			log_daemon_msg "Activating swap"
+			swapon -a -v
+			log_end_msg $?
+		fi
+	fi
+
+	#
+	# Does the root device in /etc/fstab match with the actual device ?
+	# If not we try to use the /dev/root alias device, and if that
+	# fails we create a temporary node in /run.
+	#
+	# Do this only on Linux. Neither kFreeBSD nor Hurd have
+	# /dev/root and the device ids used here are specific to
+	# Linux.
+	KERNEL="$(uname)"
+	if [ "$rootcheck" = yes ] && [ "$KERNEL" = Linux ]
+	then
+		ddev="$(mountpoint -qx $rootdev)"
+		rdev="$(mountpoint -d /)"
+		if [ "$ddev" != "$rdev" ] && [ "$ddev" != "4:0" ]
+		then
+			if [ "$(mountpoint -qx /dev/root)" = "4:0" ]
+			then
+				rootdev=/dev/root
+			else
+				if \
+					rm -f /run/rootdev \
+					&& mknod -m 600 /run/rootdev b ${rdev%:*} ${rdev#*:} \
+					&& [ -e /run/rootdev ]
+				then
+					rootdev=/run/rootdev
+				else
+					rootfatal=yes
+				fi
+			fi
+		fi
+	fi
+
+	#
+	# Bother, said Pooh.
+	#
+	if [ "$rootfatal" = yes ]
+	then
+		log_failure_msg "The device node $rootdev for the root filesystem is missing or incorrect 
+or there is no entry for the root filesystem listed in /etc/fstab. 
+The system is also unable to create a temporary node in /run. 
+This means you have to fix the problem manually."
+		log_warning_msg "A maintenance shell will now be started. 
+CONTROL-D will terminate this shell and restart the system."
+		# Start a single user shell on the console
+		if ! sulogin $CONSOLE
+		then
+			log_failure_msg "Attempt to start maintenance shell failed. 
+Will restart in 5 seconds."
+			sleep 5
+		fi
+		[ "$VERBOSE" = no ] || log_action_msg "Will now restart"
+		reboot -f
+	fi
+
+	# See if we're on AC Power.  If not, we're not gonna run our
+	# check.  If on_ac_power (in /usr/) is unavailable, behave as
+	# before and check all file systems needing it.
+# Disabled AC power check until fsck can be told to only check the
+# file system if it is corrupt when running on battery. (bug #526398)
+#	if which on_ac_power >/dev/null 2>&1 && [ "$rootcheck" = yes ]
+#	then
+#		on_ac_power >/dev/null 2>&1
+#		if [ "$?" -eq 1 ]
+#		then
+#			log_warning_msg "On battery power, so skipping file system check."
+#			rootcheck=no
+#		fi
+#	fi
+
+	#
+	# See if we want to check the root file system.
+	#
+	FSCKCODE=0
+	if is_fastboot_active
+	then
+		[ "$rootcheck" = yes ] && log_warning_msg "Fast boot enabled, so skipping root file system check."
+		rootcheck=no
+	fi
+
+	if which findmnt >/dev/null 2>&1
+	then
+		if [ "$(findmnt -f -n -o FSTYPE /)" = "btrfs" ]
+		then
+			[ "$rootcheck" = yes ] && log_warning_msg "btrfs root detected, so skipping root file system check."
+			rootcheck=no
+		fi
+	fi
+
+	if [ "$rootcheck" = yes ]
+	then
+		#
+		# Ensure that root is quiescent and read-only before fsck'ing.
+		#
+		# mount -n -o remount,ro / would be the correct syntax but
+		# mount can get confused when there is a "bind" mount defined
+		# in fstab that bind-mounts "/" somewhere else.
+		#
+		# So we use mount -n -o remount,ro $rootdev / but that can
+		# fail on older kernels on sparc64/alpha architectures due
+		# to a bug in sys_mount().
+		#
+		# As a compromise we try both.
+		#
+		if \
+			! mount    -n -o remount,ro              $rootdev /              \
+			&& ! mount -n -o remount,ro -t dummytype $rootdev /  2>/dev/null \
+			&& ! mount -n -o remount,ro                       /  2>/dev/null
+		then
+			log_failure_msg "Cannot check root file system because it is not mounted read-only."
+			rootcheck=no
+		fi
+	fi
+
+	#
+	# The actual checking is done here.
+	#
+	if [ "$rootcheck" = yes ]
+	then
+		if [ -f /forcefsck ] || grep -q -s -w -i "forcefsck" /proc/cmdline
+		then
+			force="-f"
+		else
+			force=""
+		fi
+
+		if [ "$FSCKFIX" = yes ]
+		then
+			fix="-y"
+		else
+			fix="-a"
+		fi
+
+		spinner="-C"
+		case "$TERM" in
+		  dumb|network|unknown|"")
+			spinner="" ;;
+		esac
+		# This Linux/s390x special case should go away.
+		if [ "${KERNEL}:${MACHINE}" = Linux:s390x ]
+		then
+			spinner=""
+		fi
+		
+		if [ "$VERBOSE" = no ]
+		then
+			log_action_begin_msg "Checking root file system"
+			logsave -s $FSCK_LOGFILE fsck $spinner $force $fix -t $roottype $rootdev
+			FSCKCODE=$?
+			if [ "$FSCKCODE" = 0 ]
+			then
+				log_action_end_msg 0
+			else
+				log_action_end_msg 1 "code $FSCKCODE"
+			fi
+		else
+			log_daemon_msg "Will now check root file system"
+			logsave -s $FSCK_LOGFILE fsck $spinner $force $fix -V -t $roottype $rootdev
+			FSCKCODE=$?
+			log_end_msg $FSCKCODE
+		fi
+	fi
+
+	#
+	# If there was a failure, drop into single-user mode.
+	#
+	# NOTE: "failure" is defined as exiting with a return code of
+	# 4 or larger. A return code of 1 indicates that file system
+	# errors were corrected but that the boot may proceed. A return
+	# code of 2 or 3 indicates that the system should immediately reboot.
+	#
+	if [ "$FSCKCODE" -eq 32 ]
+	then
+		log_warning_msg "File system check was interrupted by user"
+	elif [ "$FSCKCODE" -gt 3 ]
+	then
+		# Surprise! Re-directing from a HERE document (as in "cat << EOF")
+		# does not work because the root is currently read-only.
+		log_failure_msg "An automatic file system check (fsck) of the root filesystem failed. 
+A manual fsck must be performed, then the system restarted. 
+The fsck should be performed in maintenance mode with the 
+root filesystem mounted in read-only mode."
+		log_warning_msg "The root filesystem is currently mounted in read-only mode. 
+A maintenance shell will now be started. 
+After performing system maintenance, press CONTROL-D 
+to terminate the maintenance shell and restart the system."
+		# Start a single user shell on the console
+		if ! sulogin $CONSOLE
+		then
+			log_failure_msg "Attempt to start maintenance shell failed. 
+Will restart in 5 seconds."
+			sleep 5
+		fi
+		[ "$VERBOSE" = no ] || log_action_msg "Will now restart"
+		reboot -f
+	elif [ "$FSCKCODE" -gt 1 ]
+	then
+		log_failure_msg "The file system check corrected errors on the root partition 
+but requested that the system be restarted."
+		log_warning_msg "The system will be restarted in 5 seconds."
+		sleep 5
+		[ "$VERBOSE" = no ] || log_action_msg "Will now restart"
+		reboot -f
+	fi
+
+	#
+	# Remount root to final mode (rw or ro).
+	#
+	# See the comments above at the previous "mount -o remount"
+	# for an explanation why we try this twice.
+	#
+	if ! mount -n -o remount,$rootopts,$rootmode $fstabroot / 2>/dev/null
+	then
+		mount -n -o remount,$rootopts,$rootmode /
+	fi
+
+	# If possible, migrate /etc/mtab to be a symlink to
+	# /proc/mounts.  Note that not all systems e.g. Hurd currently
+	# support this.
+	if [ "$rootmode" != "ro" ]; then
+		mtab_migrate
+	fi
+
+	if selinux_enabled && [ -x /sbin/restorecon ] && [ -r /etc/mtab ]
+	then
+		restorecon /etc/mtab
+	fi
+
+	#
+	# Remove /run/rootdev if we created it.
+	#
+	rm -f /run/rootdev
+
+	# Update mount options for mounts created in early boot
+	# S01mountkernfs.sh
+	/etc/init.d/mountkernfs.sh reload
+	# S03mountdevsubfs.sh
+	/etc/init.d/mountdevsubfs.sh reload
+
+}
+
+do_status () {
+	# If / is read-write or swap is enabled, this script have done
+	# its job.
+	rootrw=false
+	swapon=false
+	if [ -f /etc/mtab ] ; then
+	    if grep " / " /etc/mtab |grep -q rw ; then
+		rootrw=true
+	    fi
+	fi
+	if [ -f /proc/swaps ] ; then
+	    if [ "$(cat /proc/swaps |grep -v ^Filename)" ] ; then
+		swapon=true
+	    fi
+	fi
+	if [ true = "$rootrw" ] || [ true = "$swapon" ] ; then
+		return 0
+	else
+		return 4
+	fi
+}
+
+case "$1" in
+  start|"")
+	do_start
+	;;
+  restart|reload|force-reload)
+	echo "Error: argument '$1' not supported" >&2
+	exit 3
+	;;
+  stop)
+	# No-op
+	;;
+  status)
+	do_status
+	exit $?
+	;;
+  *)
+	echo "Usage: checkroot.sh [start|stop]" >&2
+	exit 3
+	;;
+esac
+
+:
 
=== added file 'debian/src/initscripts/etc/init.d/hostname.sh'
--- debian/src/initscripts/etc/init.d/hostname.sh	1970-01-01 00:00:00 +0000
+++ debian/src/initscripts/etc/init.d/hostname.sh	2014-05-26 13:01:48 +0000
@@ -0,0 +1,68 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          hostname
+# Required-Start:
+# Required-Stop:
+# Should-Start:      glibc
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Set hostname based on /etc/hostname
+# Description:       Read the machines hostname from /etc/hostname, and
+#                    update the kernel value with this value.  If
+#                    /etc/hostname is empty, the current kernel value
+#                    for hostname is used.  If the kernel value is
+#                    empty, the value 'localhost' is used.
+### END INIT INFO
+
+PATH=/sbin:/bin
+
+. /lib/init/vars.sh
+. /lib/lsb/init-functions
+
+do_start () {
+	[ -f /etc/hostname ] && HOSTNAME="$(cat /etc/hostname)"
+
+	# Keep current name if /etc/hostname is missing.
+	[ -z "$HOSTNAME" ] && HOSTNAME="$(hostname)"
+
+	# And set it to 'localhost' if no setting was found
+	[ -z "$HOSTNAME" ] && HOSTNAME=localhost
+
+	[ "$VERBOSE" != no ] && log_action_begin_msg "Setting hostname to '$HOSTNAME'"
+	hostname "$HOSTNAME"
+	ES=$?
+	[ "$VERBOSE" != no ] && log_action_end_msg $ES
+	exit $ES
+}
+
+do_status () {
+	HOSTNAME=$(hostname)
+	if [ "$HOSTNAME" ] ; then
+		return 0
+	else
+		return 4
+	fi
+}
+
+case "$1" in
+  start|"")
+	do_start
+	;;
+  restart|reload|force-reload)
+	echo "Error: argument '$1' not supported" >&2
+	exit 3
+	;;
+  stop)
+	# No-op
+	;;
+  status)
+	do_status
+	exit $?
+	;;
+  *)
+	echo "Usage: hostname.sh [start|stop]" >&2
+	exit 3
+	;;
+esac
+
+:
 
=== added file 'debian/src/initscripts/etc/init.d/mountall-bootclean.sh'
--- debian/src/initscripts/etc/init.d/mountall-bootclean.sh	1970-01-01 00:00:00 +0000
+++ debian/src/initscripts/etc/init.d/mountall-bootclean.sh	2014-05-26 13:01:48 +0000
@@ -0,0 +1,37 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          mountall-bootclean
+# Required-Start:    mountall
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+# X-Start-Before:    bootmisc
+# Short-Description: bootclean after mountall.
+# Description:       Clean temporary filesystems after
+#                    all local filesystems have been mounted.
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+. /lib/init/bootclean.sh
+
+case "$1" in
+  start|"")
+	# Clean /tmp, /var/lock, /var/run
+	clean_all
+	exit $?
+	;;
+  restart|reload|force-reload)
+	echo "Error: argument '$1' not supported" >&2
+	exit 3
+	;;
+  stop|status)
+	# No-op
+	;;
+  *)
+	echo "Usage: mountall-bootclean.sh [start|stop]" >&2
+	exit 3
+	;;
+esac
+
+:
 
=== added file 'debian/src/initscripts/etc/init.d/mountall.sh'
--- debian/src/initscripts/etc/init.d/mountall.sh	1970-01-01 00:00:00 +0000
+++ debian/src/initscripts/etc/init.d/mountall.sh	2014-05-26 13:01:48 +0000
@@ -0,0 +1,94 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          mountall
+# Required-Start:    checkfs checkroot-bootclean
+# Required-Stop: 
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Mount all filesystems.
+# Description:
+### END INIT INFO
+
+PATH=/sbin:/bin
+. /lib/init/vars.sh
+. /lib/init/tmpfs.sh
+
+. /lib/lsb/init-functions
+. /lib/init/swap-functions.sh
+
+# for ntfs-3g to get correct file name encoding
+if [ -r /etc/default/locale ]; then
+	. /etc/default/locale
+	export LANG
+fi
+
+do_start() {
+	#
+	# Mount local file systems in /etc/fstab.
+	#
+	mount_all_local() {
+	    mount -a -t nonfs,nfs4,smbfs,cifs,ncp,ncpfs,coda,ocfs2,gfs,gfs2,ceph \
+		-O no_netdev
+	}
+	pre_mountall
+	if [ "$VERBOSE" = no ]
+	then
+		log_action_begin_msg "Mounting local filesystems"
+		mount_all_local
+		log_action_end_msg $?
+	else
+		log_daemon_msg "Will now mount local filesystems"
+		mount_all_local
+		log_end_msg $?
+	fi
+	post_mountall
+
+	# We might have mounted something over /run; see if
+	# /run/initctl is present.  Look for
+	# /usr/share/sysvinit/update-rc.d to verify that sysvinit (and
+	# not upstart) is installed).
+	INITCTL="/run/initctl"
+	if [ ! -p "$INITCTL" ] && [ -f "/usr/share/sysvinit/update-rc.d" ]; then
+		# Create new control channel
+		rm -f "$INITCTL"
+		mknod -m 600 "$INITCTL" p
+
+		# Reopen control channel.
+		PID="$(pidof -s /sbin/init || echo 1)"
+		[ -n "$PID" ] && kill -s USR1 "$PID"
+	fi
+
+	# Execute swapon command again, in case we want to swap to
+	# a file on a now mounted filesystem.
+	swaponagain 'swapfile'
+
+	# Remount tmpfs filesystems; with increased VM after swapon,
+	# the size limits may be adjusted.
+	mount_run mount_noupdate
+	mount_lock mount_noupdate
+	mount_shm mount_noupdate
+
+	# Now we have mounted everything, check whether we need to
+	# mount a tmpfs on /tmp.  We can now also determine swap size
+	# to factor this into our size limit.
+	mount_tmp mount_noupdate
+}
+
+case "$1" in
+  start|"")
+	do_start
+	;;
+  restart|reload|force-reload)
+	echo "Error: argument '$1' not supported" >&2
+	exit 3
+	;;
+  stop|status)
+	# No-op
+	;;
+  *)
+	echo "Usage: mountall.sh [start|stop]" >&2
+	exit 3
+	;;
+esac
+
+:
 
=== added file 'debian/src/initscripts/etc/init.d/mountdevsubfs.sh'
--- debian/src/initscripts/etc/init.d/mountdevsubfs.sh	1970-01-01 00:00:00 +0000
+++ debian/src/initscripts/etc/init.d/mountdevsubfs.sh	2014-05-26 13:01:48 +0000
@@ -0,0 +1,67 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          mountdevsubfs
+# Required-Start:    mountkernfs
+# Required-Stop:
+# Should-Start:      udev
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Mount special file systems under /dev.
+# Description:       Mount the virtual filesystems the kernel provides
+#                    that ordinarily live under the /dev filesystem.
+### END INIT INFO
+#
+# This script gets called multiple times during boot
+#
+
+PATH=/sbin:/bin
+TTYGRP=5
+TTYMODE=620
+[ -f /etc/default/devpts ] && . /etc/default/devpts
+
+KERNEL="$(uname -s)"
+
+. /lib/init/vars.sh
+. /lib/init/tmpfs.sh
+
+. /lib/lsb/init-functions
+
+# May be run several times, so must be idempotent.
+# $1: Mount mode, to allow for remounting
+mount_filesystems () {
+	MNTMODE="$1"
+
+	# Mount a tmpfs on /run/shm
+	mount_shm "$MNTMODE"
+
+	# Mount /dev/pts
+	if [ "$KERNEL" = Linux ]
+	then
+		if [ ! -d /dev/pts ]
+		then
+			mkdir --mode=755 /dev/pts
+			[ -x /sbin/restorecon ] && /sbin/restorecon /dev/pts
+		fi
+		domount "$MNTMODE" devpts "" /dev/pts devpts "-onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE"
+	fi
+}
+
+case "$1" in
+  "")
+	echo "Warning: mountdevsubfs should be called with the 'start' argument." >&2
+	mount_filesystems mount_noupdate
+	;;
+  start)
+	mount_filesystems mount_noupdate
+	;;
+  restart|reload|force-reload)
+	mount_filesystems remount
+	;;
+  stop|status)
+	# No-op
+	;;
+  *)
+	echo "Usage: mountdevsubfs [start|stop]" >&2
+	exit 3
+	;;
+esac
 
=== added file 'debian/src/initscripts/etc/init.d/mountkernfs.sh'
--- debian/src/initscripts/etc/init.d/mountkernfs.sh	1970-01-01 00:00:00 +0000
+++ debian/src/initscripts/etc/init.d/mountkernfs.sh	2014-05-26 13:01:48 +0000
@@ -0,0 +1,74 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          mountkernfs
+# Required-Start:
+# Required-Stop:
+# Should-Start:      glibc
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Mount kernel virtual file systems.
+# Description:       Mount initial set of virtual filesystems the kernel
+#                    provides and that are required by everything.
+### END INIT INFO
+
+PATH=/sbin:/bin
+. /lib/init/vars.sh
+. /lib/init/tmpfs.sh
+
+. /lib/lsb/init-functions
+
+# May be run several times, so must be idempotent.
+# $1: Mount mode, to allow for remounting
+mount_filesystems () {
+	MNTMODE="$1"
+
+	#
+	# Mount tmpfs on /run and/or /run/lock
+	#
+	mount_run "$MNTMODE"
+	mount_lock "$MNTMODE"
+
+	#
+	# Mount proc filesystem on /proc
+	#
+	domount "$MNTMODE" proc "" /proc proc "-onodev,noexec,nosuid"
+
+	#
+	# Mount sysfs on /sys
+	#
+	# Only mount sysfs if it is supported (kernel >= 2.6)
+	if grep -E -qs "sysfs\$" /proc/filesystems
+	then
+		domount "$MNTMODE" sysfs "" /sys sysfs "-onodev,noexec,nosuid"
+	fi
+
+	if [ -d /sys/fs/pstore ]
+	then
+		domount "$MNTMODE" pstore "" /sys/fs/pstore pstore ""
+	fi
+
+	if [ -d /sys/kernel/config ]
+	then
+		domount "$MNTMODE" configfs "" /sys/kernel/config configfs ""
+	fi
+}
+
+case "$1" in
+  "")
+	echo "Warning: mountkernfs should be called with the 'start' argument." >&2
+	mount_filesystems mount_noupdate
+	;;
+  start)
+	mount_filesystems mount_noupdate
+	;;
+  restart|reload|force-reload)
+	mount_filesystems remount
+	;;
+  stop|status)
+	# No-op
+	;;
+  *)
+	echo "Usage: mountkernfs [start|stop]" >&2
+	exit 3
+	;;
+esac
 
=== added file 'debian/src/initscripts/etc/init.d/mountnfs-bootclean.sh'
--- debian/src/initscripts/etc/init.d/mountnfs-bootclean.sh	1970-01-01 00:00:00 +0000
+++ debian/src/initscripts/etc/init.d/mountnfs-bootclean.sh	2014-05-26 13:01:48 +0000
@@ -0,0 +1,37 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          mountnfs-bootclean
+# Required-Start:    $local_fs mountnfs
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+# X-Start-Before:    bootmisc
+# Short-Description: bootclean after mountnfs.
+# Description:       Clean temporary filesystems after
+#                    network filesystems have been mounted.
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+. /lib/init/bootclean.sh
+
+case "$1" in
+  start|"")
+	# Clean /tmp, /var/lock, /var/run
+	clean_all
+	exit $?
+	;;
+  restart|reload|force-reload)
+	echo "Error: argument '$1' not supported" >&2
+	exit 3
+	;;
+  stop|status)
+	# No-op
+	;;
+  *)
+	echo "Usage: mountnfs-bootclean.sh [start|stop]" >&2
+	exit 3
+	;;
+esac
+
+:
 
=== added file 'debian/src/initscripts/etc/init.d/mountnfs.sh'
--- debian/src/initscripts/etc/init.d/mountnfs.sh	1970-01-01 00:00:00 +0000
+++ debian/src/initscripts/etc/init.d/mountnfs.sh	2014-05-26 13:01:48 +0000
@@ -0,0 +1,105 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          mountnfs
+# Required-Start:    $local_fs
+# Required-Stop:
+# Should-Start:      $network $portmap nfs-common  udev-mtab
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Wait for network file systems to be mounted
+# Description:       Network file systems are mounted by
+#                    /etc/network/if-up.d/mountnfs in the background
+#                    when interfaces are brought up; this script waits
+#                    for them to be mounted before carrying on.
+### END INIT INFO
+
+. /lib/init/vars.sh
+. /lib/lsb/init-functions
+
+do_wait_async_mount() {
+	# Read through fstab line by line. If it is NFS, set the flag
+	# for mounting NFS file systems. If any NFS partition is found
+	# then wait around for it.
+
+	waitnfs=
+	for file in "$(eval ls $(fstab_files))"; do
+		if [ -f "$file" ]; then
+			while read DEV MTPT FSTYPE OPTS REST; do
+				case "$DEV" in
+				  ""|\#*)
+					continue
+					;;
+				esac
+				case "$OPTS" in
+				  noauto|*,noauto|noauto,*|*,noauto,*)
+					continue
+					;;
+				esac
+				case "$FSTYPE" in
+				  nfs|nfs4|smbfs|cifs|coda|ncp|ncpfs|ocfs2|gfs|ceph)
+					;;
+				  *)
+					continue
+					;;
+				esac
+				case "$MTPT" in
+				  /usr/local|/usr/local/*)
+					;;
+				  /usr|/usr/*)
+					waitnfs="$waitnfs $MTPT"
+					;;
+				  /var|/var/*)
+					waitnfs="$waitnfs $MTPT"
+					;;
+				esac
+			done < "$file"
+		fi
+	done
+
+	# Wait for each path, the timeout is for all of them as that's
+	# really the maximum time we have to wait anyway
+	TIMEOUT=900
+	for mountpt in $waitnfs; do
+		log_action_begin_msg "Waiting for $mountpt"
+
+		while ! mountpoint -q $mountpt; do
+			sleep 0.1
+
+			TIMEOUT=$(( $TIMEOUT - 1 ))
+			if [ $TIMEOUT -le 0 ]; then
+				log_action_end_msg 1
+				break
+			fi
+		done
+
+		if [ $TIMEOUT -gt 0 ]; then
+			log_action_end_msg 0
+		fi
+	done
+}
+
+case "$1" in
+    start)
+        # Using 'no !=' instead of 'yes =' to make sure async nfs
+        # mounting is the default even without a value in
+        # /etc/default/rcS
+        if [ no != "$ASYNCMOUNTNFS" ] ; then
+                do_wait_async_mount
+        else
+                FROMINITD=yes /etc/network/if-up.d/mountnfs
+        fi
+        ;;
+    restart|reload|force-reload)
+        echo "Error: argument '$1' not supported" >&2
+        exit 3
+        ;;
+    stop|status)
+        # No-op
+        ;;
+    *)
+        echo "Usage: $0 start|stop" >&2
+        exit 3
+        ;;
+esac
+
+:
 
=== modified file 'debian/src/sysv-rc/sbin/invoke-rc.d'
--- debian/src/sysv-rc/sbin/invoke-rc.d	2014-05-16 10:27:06 +0000
+++ debian/src/sysv-rc/sbin/invoke-rc.d	2014-05-26 13:01:48 +0000
@@ -24,7 +24,6 @@
 RUNLEVELHELPER=/sbin/runlevel
 POLICYHELPER=/usr/sbin/policy-rc.d
 INITDPREFIX=/etc/init.d/
-UPSTARTDIR=/etc/init/
 RCDPREFIX=/etc/rc
 
 # Options
@@ -273,7 +272,7 @@
 # If we're running on upstart and there's an upstart job of this name, do
 # the rest with upstart instead of calling the init script.
 if which initctl >/dev/null && initctl version 2>/dev/null | grep -q upstart \
-   && [ -e "$UPSTARTDIR/${INITSCRIPTID}.conf" ]
+   && initctl status ${INITSCRIPTID} 1>/dev/null 2>/dev/null
 then
     is_upstart=1
 elif test -d /run/systemd/system ; then
@@ -283,7 +282,7 @@
     ## Verifies if the given initscript ID is known
     ## For sysvinit, this error is critical
     printerror unknown initscript, ${INITDPREFIX}${INITSCRIPTID} not found.
-    if [ ! -e "$UPSTARTDIR/${INITSCRIPTID}.conf" ]; then
+    if [ ! -e "/etc/init/${INITSCRIPTID}.conf" ]; then
 	# If the init script doesn't exist, but the upstart job does, we
 	# defer the error exit; we might be running in a chroot and
 	# policy-rc.d might say not to start the job anyway, in which case
 
=== modified file 'debian/src/sysv-rc/sbin/update-rc.d'
--- debian/src/sysv-rc/sbin/update-rc.d	2012-06-30 23:21:06 +0000
+++ debian/src/sysv-rc/sbin/update-rc.d	2014-05-26 13:01:48 +0000
@@ -377,9 +377,12 @@
 
     $scriptname = shift @args;
     $action = shift @args;
+    my $insserv = "/usr/lib/insserv/insserv";
+    $insserv = "/sbin/insserv" if ( -x "/sbin/insserv");
     if ("remove" eq $action) {
         if ( -f "/etc/init.d/$scriptname" ) {
-            my $rc = system("/sbin/insserv", @opts, "-r", $scriptname) >> 8;
+            # Fallback for older insserv package versions [2014-04-16]
+            my $rc = system($insserv, @opts, "-r", $scriptname) >> 8;
             if (0 == $rc && !$notreally) {
                 remove_last_action($scriptname);
             }
@@ -388,7 +391,7 @@
         } else {
             # insserv removes all dangling symlinks, no need to tell it
             # what to look for.
-            my $rc = system("insserv", @opts) >> 8;
+            my $rc = system($insserv, @opts) >> 8;
             if (0 == $rc && !$notreally) {
                 remove_last_action($scriptname);
             }
@@ -403,7 +406,7 @@
         cmp_args_with_defaults($scriptname, $action, @args);
 
         if ( -f "/etc/init.d/$scriptname" ) {
-            my $rc = system("insserv", @opts, $scriptname) >> 8;
+            my $rc = system($insserv, @opts, $scriptname) >> 8;
             if (0 == $rc && !$notreally) {
                 save_last_action($scriptname, @orig_argv);
             }
@@ -415,7 +418,7 @@
     } elsif ("disable" eq $action || "enable" eq $action) {
         insserv_toggle($notreally, $action, $scriptname, @args);
         # Call insserv to resequence modified links
-        my $rc = system("insserv", @opts, $scriptname) >> 8;
+        my $rc = system($insserv, @opts, $scriptname) >> 8;
         if (0 == $rc && !$notreally) {
             save_last_action($scriptname, @orig_argv);
         }
 
=== modified file 'debian/sysv-rc.postinst'
--- debian/sysv-rc.postinst	2013-05-17 06:03:10 +0000
+++ debian/sysv-rc.postinst	2014-05-26 13:01:48 +0000
@@ -7,7 +7,7 @@
 logfile="$logdir/run-$now.log"
 
 # Make sure insserv is in path
-PATH=/sbin:$PATH
+PATH=/sbin:/usr/lib/insserv/:$PATH
 
 # Based on code from dash postinst
 check_divert() {
@@ -41,7 +41,7 @@
 }
 
 legacy_bootordering() {
-    for f in /etc/rc0.d/S* ; do
+    for f in /etc/rc0.d/S* /etc/rc6.d/S* /etc/init.d/.legacy-bootordering; do
 	if [ -f $f ] ; then
 	    return 0
 	fi
@@ -61,7 +61,7 @@
     ) > $logfile 2>&1 || return 1
 
     # Indicate that system is no longer using the legacy ordering
-    rm $flagfile
+    rm -f /etc/init.d/.legacy-bootordering
 
     return 0
 }
@@ -74,15 +74,7 @@
 			/usr/sbin/update-rc.d-insserv
 	fi
 
-# Disabled in Ubuntu until LSB-capable init scripts are restored (via
-# debhelper 9.20120909ubuntu2).
-
-#	if dpkg --compare-versions "$2" lt "2.88dsf-23"; then
-#	    rm -f /etc/init.d/.legacy-bootordering
-#	fi
-
-#	if legacy_bootordering ; then
-	if false; then
+	if legacy_bootordering ; then
 	    # Still using legacy ordering, try to convert
 	    if activate_insserv ; then
 		echo "success: Enabled dependency based boot system." 1>&2
 
=== modified file 'debian/sysv-rc.preinst'
--- debian/sysv-rc.preinst	2013-05-17 06:03:10 +0000
+++ debian/sysv-rc.preinst	2014-05-26 13:01:48 +0000
@@ -15,8 +15,6 @@
 	rm -f /var/lib/update-rc.d/*
     	;;
     install)
-    	# Ubuntu does not use this by default
-	touch /etc/init.d/.legacy-bootordering
     	;;
 
     abort-upgrade)