From: Michael Prokop <mika@grml.org>
Date: Wed, 25 Oct 2023 08:04:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/226'
X-Git-Tag: v0.105~16
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=2999d61efa6841d22024fc6c5fde16dc44db8a20;hp=1e27d8ed79cf72dbb999e7fb51ff0bf92a4c3383;p=grml-debootstrap.git

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

diff --git a/chroot-script b/chroot-script
index 6655cb3..3c69f00 100755
--- a/chroot-script
+++ b/chroot-script
@@ -654,7 +654,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/grml-debootstrap b/grml-debootstrap
index 6ed8511..8994542 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -1348,7 +1348,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
@@ -1433,7 +1433,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
 }