From: Michael Prokop <mika@grml.org>
Date: Fri, 2 Feb 2024 14:43:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/272'
X-Git-Tag: v0.108~1
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=7dc77a076ff96e9b528493f2aab8f1d2b7af56ea;hp=df9c1ae2086610336fe7334a107dfe806765935a;p=grml-debootstrap.git

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

diff --git a/grml-debootstrap b/grml-debootstrap
index dfef90b..97dc26b 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -247,6 +247,32 @@ check4progs(){
 }
 # }}}
 
+# unmount mountpoint {{{
+try_umount() {
+  local tries=$1
+  local mountpoint="$2"
+
+  if ! mountpoint "$mountpoint" &>/dev/null ; then
+    return 0
+  fi
+
+  for (( try=1; try<=tries; try++ )); do
+    if [[ ${try} -eq ${tries} ]]; then
+      # Last time, show errors this time
+      umount "${mountpoint}" && return 0
+    else
+      # Not last time, hide errors until fatal
+      if umount "${mountpoint}" 2>/dev/null ; then
+        return 0
+      else
+        sleep 1
+      fi
+    fi
+  done
+  return 1  # Tried enough
+}
+# }}}
+
 # helper functions {{{
 cleanup() {
   if [ -n "$CHROOT_VARIABLES" ] ; then
@@ -2012,32 +2038,6 @@ execute_post_scripts() {
 }
 # }}}
 
-# unmount mountpoint {{{
-try_umount() {
-  local tries=$1
-  local mountpoint="$2"
-
-  if ! mountpoint "$mountpoint" &>/dev/null ; then
-    return 0
-  fi
-
-  for (( try=1; try<=tries; try++ )); do
-    if [[ ${try} -eq ${tries} ]]; then
-      # Last time, show errors this time
-      umount "${mountpoint}" && return 0
-    else
-      # Not last time, hide errors until fatal
-      if umount "${mountpoint}" 2>/dev/null ; then
-        return 0
-      else
-        sleep 1
-      fi
-    fi
-  done
-  return 1  # Tried enough
-}
-# }}}
-
 # execute chroot-script {{{
 chrootscript() {
   if ! [ -r "$MNTPOINT/bin/chroot-script" ] ; then