Fix bootstrap

Author: Frenzie

Makefile

@@ -5,9 +5,8 @@ all: clean build up
 jessie32 jessie64:
 	@cd debian && \
 	packer build debian-$@.json && \
-	vagrant box remove $@.box ; \
-	vagrant box add $@.box && \
-	vagrant up $@
+	vagrant box add --name $@ --force $@.box && \
+	vagrant up
 
 up:
 	vagrant destroy -f && vagrant box remove vagrant_machine && vagrant up || vagrant box remove vagrant_machine && vagrant up || vagrant up

debian/scripts/bootstrap.sh

@@ -31,10 +31,10 @@ sed -i 's/GRUB_TIMEOUT=[0-9]\{,2\}/GRUB_TIMEOUT=0/' /etc/default/grub
 
 update-grub
 
-# set up sbuild
-mkdir /root/.gnupg # To work around #792100
+# set up sbuild for i386 package
+mkdir /root/.gnupg  #Work around #792100 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792100
 rngd -r /dev/urandom #Fake entropy for the keygen; REMOVE if key security is important
-sbuild-update --keygen #Requirement for sbuild
+su - -c 'sbuild-update --keygen' #Requirement for sbuild
 sbuild-adduser vagrant
-mkdir vagrant/chroot
-sbuild-createchroot --arch=i386 --make-sbuild-tarball=$HOME/chroot/stable-i386.tar.gz stable `mktemp -d` http://httpredir.debian.org/debian
+mkdir /home/vagrant/chroot
+sbuild-createchroot --arch=i386 stable /home/vagrant/chroot/stable-i386 http://httpredir.debian.org/debian