Merge branch 'master' into toutatis

makepackage

@@ -129,8 +129,9 @@ EOF
     [ $UPSTREAM != hardy -a $UPSTREAM != lucid -a $UPSTREAM != maverick ] &&  echo "force-unsafe-io" > $CHROOT/etc/dpkg/dpkg.cfg.d/02apt-speedup
     $C apt-get update
     [ $UPSTREAM != hardy ] && $C apt-get --force-yes -y install eatmydata
-    $C apt-get --force-yes -y dist-upgrade
+    $C apt-get --force-yes -y install sysv-rc dpkg sysvinit-utils upstart
     disablescripts
+    $C apt-get --force-yes -y dist-upgrade
     $C apt-get --force-yes -y install devscripts build-essential liburi-perl python-setuptools pkgbinarymangler wget rpl aptitude quilt fakeroot ccache
     $C apt-get clean
 
@@ -166,6 +167,12 @@ mount -t proc none /proc
 export DEBIAN_FRONTEND=noninteractive
 export LANG=C
 apt-get update
+apt-get --force-yes -y install sysv-rc dpkg sysvinit-utils upstart
+for i in /usr/sbin/invoke-rc.d /sbin/start /sbin/start-stop-daemon
+do
+    mv \$i \$i.real
+    cp /bin/true \$i
+done
 apt-get --force-yes -y dist-upgrade
 umount /proc
 EOF