Add drvtools,mdb-proc,mdb-kvm,dtrace; check deps before actuall work; fix BOOTSTRAPFS

1 files changed, 5 insertions, 3 deletions

diff --git a/protostar b/protostar
index 1ee8b77..a1e9ad5 100755
--- a/protostar
+++ b/protostar
@@ -3,6 +3,8 @@
 set -e
 set -u
 
+dpkg -l ufsutils genisoimage debootstrap
+
 TMP="${TMP:-/var/tmp}"
 
 DATE=$(date '+%Y-%m-%d-%H%M')
@@ -16,7 +18,7 @@ ISOLABEL="${ISOLABEL:-dyson-netinst}"
 ISONAME="${ISONAME:-${ISOLABEL}-${DATE}}.iso"
 
 ROOT="${TMP}/ROOT"
-BOOTSTRAPFS="${BOOTSTRAPFS:-dyson/deb}"
+BOOTSTRAPFS="${BOOTSTRAPFS:-rpool/deb}"
 ROOT="/$BOOTSTRAPFS"
 BOOTARCH="${ROOT}/boot_archive"
 
@@ -50,11 +52,11 @@ else
 echo "Preparing base system (debootstrap)..."
 debootstrap \
     --exclude=locales,syslogd,gawk,aptitude,aptitude-common,libboost-iostreams1.48.0,libboost-iostreams1.49.0,libcwidget3 \
-    --include=python-newt,truss,installgrub,illumos-grub-eltorito,illumos-kernel,mc,vim,screen,openssh-client,wget,bzip2,xz-utils,debootstrap,less,file,lynx,bash-completion \
+    --include=python-newt,truss,installgrub,illumos-grub-eltorito,illumos-kernel,mc,vim,screen,openssh-client,wget,bzip2,xz-utils,debootstrap,less,file,lynx,bash-completion,drvtools,mdb-proc,mdb-kvm,dtrace \
     "${DIST}" \
     "${ROOT}" \
     "${REPO}"
-zfs snapshot dyson/deb@init
+zfs snapshot ${BOOTSTRAPFS}@init
 fi
 
 mkdir "$ROOT/usr/install"