X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=chroot-script;h=367ed9b7ff7fb8c28f113a53344c0f221adf8599;hb=dc0052a90daceefe39aad25ff51b2bfb5abc9c4f;hp=2f6efbad39deeb8f01eec09f728e81f3aa454e6c;hpb=670035bdde9ac232b3869eea4a66f5412d1d1132;p=grml-debootstrap.git

diff --git a/chroot-script b/chroot-script
index 2f6efba..367ed9b 100755
--- a/chroot-script
+++ b/chroot-script
@@ -11,6 +11,7 @@
 
 # error_handler {{{
 if [ "$REPORT_TRAP_ERR" = "yes" ] || [ "$FAIL_TRAP_ERR" = "yes" ]; then
+   set -e
    set -E
    set -o pipefail
    trap "error_handler" ERR
@@ -323,11 +324,7 @@ get_kernel_version() {
   # shellcheck disable=SC2153
   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
+      KARCH='686-pae'
       ;;
     amd64)
       KARCH='amd64'
@@ -663,7 +660,7 @@ available_ids() {
   echo "${ids}"
 }
 
-# helper function to report corresponding /dev/disk/by-id/… for a given device name,
+# helper function to report corresponding /dev/disk/by-id/ for a given device name,
 # based on GRUB's postinst script
 device_to_id() {
   local id