X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=packer%2Fdebian64_provision.sh;h=2a416defa9992e6255cfc7ccd7258f3c746433f6;hp=8d1920ea4b994070bd37d52a0e229897d1dfeac4;hb=3314417c2d2dc914523186434b3352637ef7ea12;hpb=45b4746a0ac2eebe631be0466fc62741c32744f8

diff --git a/packer/debian64_provision.sh b/packer/debian64_provision.sh
index 8d1920e..2a416de 100644
--- a/packer/debian64_provision.sh
+++ b/packer/debian64_provision.sh
@@ -67,7 +67,13 @@ virtualbox_setup() {
   mountpoint "${TARGET}/media/cdrom" >/dev/null && umount "${TARGET}/media/cdrom"
   mount -t iso9660 $isofile "${TARGET}/media/cdrom/"
   UTS_RELEASE=$KERNELVERSION LD_PRELOAD=/tmp/fake-uname.so grml-chroot "$TARGET" /media/cdrom/VBoxLinuxAdditions.run --nox11 || true
-  tail -10 "${TARGET}/var/log/VBoxGuestAdditions.log"
+  if grep -q "make: .*vboxguest.*Error 2" "${TARGET}/var/log/vboxadd-install.log" ; then
+    echo "Error: looks like a fatal error happened during installation of VirtualBox Guest Additions." >&2
+    exit 1
+  fi
+  [ -r "${TARGET}/var/log/VBoxGuestAdditions.log" ] && tail -10 "${TARGET}/var/log/VBoxGuestAdditions.log"
+  [ -r "${TARGET}/var/log/vboxadd-install.log" ]    && tail -10 "${TARGET}/var/log/vboxadd-install.log"
+  [ -r "${TARGET}/var/log/vboxadd-setup.log" ]      && tail -10 "${TARGET}/var/log/vboxadd-setup.log"
   umount "${TARGET}/media/cdrom/"
 
   # work around bug in VirtualBox 4.3.18 which leaves process behind,
@@ -100,7 +106,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 +190,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"
@@ -223,6 +231,29 @@ grml_debootstrap_execution() {
   $GRML_DEBOOTSTRAP --hostname "${DEBIAN_VERSION}" --release "${DEBIAN_VERSION}" --target "${INSTALL_TARGET}" --grub "${GRUB_TARGET}" --password grml --force $GRML_DEB_OPTIONS 2>&1 | tee -a /tmp/grml-debootstrap.log
 }
 
+apply_nic_workaround() {
+  # release specific stuff
+  case "$DEBIAN_VERSION" in
+    stretch|buster|bullseye|unstable|sid)
+      ;;
+    *)
+      echo "* Debian $DEBIAN_VERSION doesn't require NIC workaround"
+      return 0
+      ;;
+  esac
+
+  if ! mountpoint "${TARGET}" &>/dev/null ; then
+    echo "* Mounting target system"
+    mount "${INSTALL_TARGET}" "${TARGET}"
+  fi
+
+  echo "* Disabling predictable network interface names for Debian $DEBIAN_VERSION"
+  ln -s /dev/null "${TARGET}/etc/udev/rules.d/80-net-setup-link.rules"
+
+  echo "* Rebuilding initramfs to include udev configuration change"
+  chroot "${TARGET}" update-initramfs -u -k all
+}
+
 log_system_information() {
   if ! mountpoint "${TARGET}" &>/dev/null ; then
     echo "* Mounting target system"
@@ -288,6 +319,7 @@ grml_debootstrap_setup
 grml_debootstrap_execution
 virtualbox_setup
 vagrant_setup
+apply_nic_workaround
 log_system_information
 clean_apt_files
 automated_tests