packer: explicitly set Bash as default shell for Vagrant user

[grml-debootstrap.git] / packer / debian64_provision.sh

diff --git a/packer/debian64_provision.sh b/packer/debian64_provision.sh
index 8d1920e..eff15d1 100644 (file)
--- a/packer/debian64_provision.sh
+++ b/packer/debian64_provision.sh
@@ -100,7 +100,7 @@ vagrant_setup() {
   chroot ${TARGET} apt-get -y install sudo
 
   echo "* Adding Vagrant user"
-  chroot ${TARGET} useradd -d /home/vagrant -m -u 1000 vagrant
+  chroot ${TARGET} useradd -d /home/vagrant -m -u 1000 vagrant -s /bin/bash
 
   echo "* Installing Vagrant ssh key"
   mkdir -m 0700 -p ${TARGET}/home/vagrant/.ssh
@@ -184,11 +184,13 @@ EOF
     echo "** Using grml-debootstrap from Git repository"
     git clone git://git.grml.org/grml-debootstrap.git
     cd grml-debootstrap
-    GRML_DEBOOTSTRAP="$(pwd)/grml-debootstrap"
+    GRML_DEBOOTSTRAP="CONFFILES=$(pwd) $(pwd)/grml-debootstrap"
   elif [ "$GRML_DEBOOTSTRAP_VERSION" = "local" ] ; then
     echo "** GRML_DEBOOTSTRAP_VERSION is set to '$GRML_DEBOOTSTRAP_VERSION'"
-    echo "** Using /tmp/grml-debootstrap derived from local system as grml-deboostrap script"
-    GRML_DEBOOTSTRAP="bash /tmp/grml-debootstrap"
+    echo "** Using /tmp/grml-debootstrap derived from local system"
+    cd /tmp/grml-debootstrap
+    export CONFFILES=$(pwd)/etc/debootstrap
+    GRML_DEBOOTSTRAP="bash $(pwd)/usr/sbin/grml-debootstrap"
   elif [ "$GRML_DEBOOTSTRAP_VERSION" = "iso" ] ; then
     echo "** GRML_DEBOOTSTRAP_VERSION is set to '$GRML_DEBOOTSTRAP_VERSION'"
     echo "** Using grml-debootstrap as provided on ISO"