Currently, if puppet has returned an error during an initial build,
the whole build process should be restarted, because some things
in plugins have not been run.
Remove "ondemand" startup script with update-rc.d so that
some tools will not stumble upon it.
Run puppet-stuff before dist-upgrade, so that the build
can go through properly with just one stage.
This changes the order quite a bit, so perhaps we should later
move the dist-upgrade later instead?