X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=e189e4755cfa8bf85f910f363c08c90dcb9f097d;hp=eeb62cfe00f217728a1cf2caca49fa183b274eaa;hb=aba5a80ceb27cb034ad847afa41c2a5d645f0916;hpb=bd598a0a83a368fd4692afa3b1967f0ccff8b2d8

diff --git a/chroot-script b/chroot-script
index eeb62cf..e189e47 100755
--- a/chroot-script
+++ b/chroot-script
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/debootstrap/chroot-script
 # Purpose:       script executed in chroot when installing Debian via grml-debootstrap
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
@@ -9,6 +9,14 @@
 # this script as /bin/chroot-script on your new installed system
 ################################################################################
 
+# error_handler {{{
+if [ "$REPORT_TRAP_ERR" = "yes" ] || [ "$FAIL_TRAP_ERR" = "yes" ]; then
+   set -E
+   set -o pipefail
+   trap "error_handler" ERR
+fi
+# }}}
+
 . /etc/debootstrap/config    || exit 1
 . /etc/debootstrap/variables || exit 1
 
@@ -154,8 +162,8 @@ EOF
        apt-get update $DPKG_OPTIONS
      else
        # make sure we have the keys available for aptitude
-       gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787
-       gpg --export F61E2E7CECDEA787 | apt-key add - || true # not yet sure
+       gpg --keyserver subkeys.pgp.net --recv-keys 709BCE51568573EBC160E590F61E2E7CECDEA787
+       gpg --export 709BCE51568573EBC160E590F61E2E7CECDEA787 | apt-key add - || true # not yet sure
        # why it's necessary, sometimes we get an error even though it works [mika]
      fi
 
@@ -304,9 +312,19 @@ get_kernel_version() {
     return 0
   fi
 
-  case $ARCH in
-    i386)   KARCH=686   ;;
-    amd64)  KARCH=amd64 ;;
+  local KARCH
+
+  case "$ARCH" in
+    i386)
+      case "$RELEASE" in
+        lenny|squeeze|wheezy) KARCH='686' ;;
+        # since jessie the linux-image-686 image doesn't exist any longer
+        *) KARCH='686-pae' ;;
+      esac
+      ;;
+    amd64)
+      KARCH='amd64'
+      ;;
     *)
       echo "Only i386 and amd64 are currently supported" >&2
       return 1
@@ -565,7 +583,16 @@ grub_install() {
      done
   else
      echo "Installing grub on ${GRUB}:"
-     grub-install --no-floppy "$GRUB"
+     case "$RELEASE" in
+       lenny|squeeze|wheezy)
+         grub-install --no-floppy "$(readlink -f "${GRUB}")"
+         ;;
+       *)
+         echo "(hd0) ${GRUB}" > /boot/grub/device.map
+         grub-install "(hd0)"
+         rm /boot/grub/device.map
+         ;;
+     esac
   fi
 
   echo "Adjusting grub configuration for use on ${GRUB}."