From: Michael Prokop <mika@grml.org>
Date: Wed, 25 Oct 2023 08:06:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/214'
X-Git-Tag: v0.105~15
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=ad99b61111e1eeb20d56367e55d5b849b16c5de3;hp=670035bdde9ac232b3869eea4a66f5412d1d1132;p=grml-debootstrap.git

Merge remote-tracking branch 'origin/pr/214'
---

diff --git a/chroot-script b/chroot-script
index 2f6efba..2865387 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
@@ -663,7 +664,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
diff --git a/config b/config
index 68850cc..e902689 100644
--- a/config
+++ b/config
@@ -16,7 +16,7 @@
 # If you specify a string *without* /dev/ in the beginning, grml-debootstrap
 # assumes you want to install Debian into a directory. MKFS, TUNE2FS, GRUB and
 # FSCK will be ignored.
-# Make sure the TARGET-directory points to a filesystem which has the dev, exec
+# Make sure the TARGET-directory points to a filesystem which has the dev, exec
 # options enabled.
 # Default: no default.
 # Usage examples:
@@ -129,7 +129,7 @@
 # Default: 'yes' (if file exists)
 # DEBCONF='no'
 
-# Run scripts from /etc/debootstrap/pre-scripts/ before creating the chroot.
+# Run scripts from /etc/debootstrap/pre-scripts/ before creating the chroot.
 # Default: 'yes'
 # PRE_SCRIPTS='no'
 
diff --git a/grml-debootstrap b/grml-debootstrap
index f6c5535..fa1e19e 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -31,6 +31,7 @@ last bash command: $last_bash_command"
 }
 
 if [ "$REPORT_TRAP_ERR" = "yes" ] || [ "$FAIL_TRAP_ERR" = "yes" ]; then
+   set -e
    set -E
    set -o pipefail
    trap "error_handler" ERR
@@ -1360,7 +1361,7 @@ mkfs() {
         bailout 1
       else
         einfo "Changing disk uuid for $TARGET to fixed (non-random) value $DISK_IDENTIFIER using tune2fs"
-        tune2fs "$TARGET" -U "$DISK_IDENTIFIER"
+        tune2fs "$TARGET" -U "$DISK_IDENTIFIER" </dev/null
         eend $?
       fi
     fi
@@ -1445,7 +1446,7 @@ mountpoint_to_blockdevice() {
 tunefs() {
   if [ -n "$TUNE2FS" ] && echo "$MKFS" | grep -q "mkfs.ext" ; then
      einfo "Disabling automatic filesystem check on $TARGET via tune2fs"
-     $TUNE2FS "$TARGET"
+     $TUNE2FS "$TARGET" </dev/null
      eend $?
   fi
 }
@@ -2231,7 +2232,8 @@ for i in format_efi_partition prepare_vm mkfs tunefs \
          preparechroot execute_pre_scripts chrootscript execute_post_scripts \
          remove_configs umount_chroot grub_install umount_target fscktool ; do
     if stage "${i}" ; then
-      if "$i" ; then
+      "$i"
+      if [ $? -eq 0 ]; then
         stage "${i}" 'done' && rm -f "${STAGES}/${i}"
       else
         bailout 2 "$i"