tools/create-image.sh: simplify script

Checkout necessary packages during debootstrap instead of a separate step.

1 files changed, 1 insertions, 5 deletions

diff --git a/tools/create-image.sh b/tools/create-image.sh
index 5fec0b733..808a9b863 100755
--- a/tools/create-image.sh
+++ b/tools/create-image.sh
@@ -9,7 +9,7 @@ set -eux
 # Create a minimal Debian-wheezy distributive as a directory.
 sudo rm -rf wheezy
 mkdir -p wheezy
-sudo debootstrap --include=openssh-server wheezy wheezy
+sudo debootstrap --include=openssh-server,curl,tar,time,strace,sudo,less wheezy wheezy
 
 # Set some defaults and enable promtless ssh to the machine for root.
 sudo sed -i '/^root/ { s/:x:/::/ }' wheezy/etc/passwd
@@ -25,10 +25,6 @@ mkdir -p ssh
 ssh-keygen -f ssh/id_rsa -t rsa -N ''
 cat ssh/id_rsa.pub | sudo tee wheezy/root/.ssh/authorized_keys
 
-# Install some misc packages.
-sudo chroot wheezy /bin/bash -c "export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin; \
-apt-get update; apt-get install --yes curl tar time strace sudo"
-
 # Build a disk image
 dd if=/dev/zero of=wheezy.img bs=1M seek=1023 count=1
 mkfs.ext4 -F wheezy.img