From f37fb2af5337830fa2c05fa1c1cac2f351dfb0dd Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sat, 2 Sep 2023 09:15:09 +0200
Subject: [PATCH] move progress_wait up

---
 usr/share/archboot/base/init | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/usr/share/archboot/base/init b/usr/share/archboot/base/init
index 164cdfcd4..158acacae 100755
--- a/usr/share/archboot/base/init
+++ b/usr/share/archboot/base/init
@@ -21,6 +21,21 @@ ${2}
 XXX
 EOF
 }
+# $1: start percentage $2: end percentage $3: message $4: sleep time
+_progress_wait() {
+    _COUNT=${1}
+    while true; do
+        if [[ "${_COUNT}" -lt "${2}" ]]; then
+            _progress "${_COUNT}" "${3}"
+        fi
+        if [[ "${_COUNT}" -gt "${2}" ]]; then
+            _progress "${2}" "${3}"
+        fi
+        _COUNT="$((_COUNT+1))"
+        read -r -t "${4}"
+        ! [[ -e /.archboot ]] && break
+    done
+}
 _task() {
     [[ "${1}" == kernel ]] && bsdcpio -u -i "*/lib/modules/"  "*/lib/firmware/" <"/mnt/boot/initrd-$(uname -m).img" &>/dev/null
     if [[ "${1}" == cleanup ]]; then
@@ -55,21 +70,6 @@ _task() {
     fi
     rm /.archboot
 }
-# $1: start percentage $2: end percentage $3: message $4: sleep time
-_progress_wait() {
-    _COUNT=${1}
-    while true; do
-        if [[ "${_COUNT}" -lt "${2}" ]]; then
-            _progress "${_COUNT}" "${3}"
-        fi
-        if [[ "${_COUNT}" -gt "${2}" ]]; then
-            _progress "${2}" "${3}"
-        fi
-        _COUNT="$((_COUNT+1))"
-        read -r -t "${4}"
-        ! [[ -e /.archboot ]] && break
-    done
-}
 _first_stage() {
     cd /
     # move in modules from main initrd