From d889a150c11f07d7eb8a543d083dd3ea8819a9e3 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 29 Nov 2022 10:14:35 +0100
Subject: [PATCH] run locale.gen and mkinitcpio on action

---
 usr/bin/archboot-setup.sh                   | 7 +------
 usr/lib/archboot/installer/configuration.sh | 3 +++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/usr/bin/archboot-setup.sh b/usr/bin/archboot-setup.sh
index f29db4421..70b547600 100755
--- a/usr/bin/archboot-setup.sh
+++ b/usr/bin/archboot-setup.sh
@@ -133,6 +133,7 @@ configure_system() {
             break           
         elif [[ "${FILE}" = "/etc/mkinitcpio.conf" ]]; then       # non-file
             set_mkinitcpio
+            run_mkinitcpio
         elif [[ "${FILE}" = "/etc/locale.gen" ]]; then            # non-file
             set_locale
             ${EDITOR} "${DESTDIR}""${FILE}"
@@ -143,12 +144,6 @@ configure_system() {
         fi
     done
     if [[ ${S_CONFIG} -eq 1 ]]; then
-        # only done on normal exit of configure menu
-        ## POSTPROCESSING ##
-        # /etc/initcpio.conf
-        run_mkinitcpio
-        run_locale_gen
-        ## END POSTPROCESSING ##
         NEXTITEM="7"
     fi
 }
diff --git a/usr/lib/archboot/installer/configuration.sh b/usr/lib/archboot/installer/configuration.sh
index 096c563e8..be0bd1fae 100644
--- a/usr/lib/archboot/installer/configuration.sh
+++ b/usr/lib/archboot/installer/configuration.sh
@@ -23,6 +23,8 @@ set_mkinitcpio() {
     done
     if [[ "${HOOK_ERROR}" = "1" ]]; then
         DIALOG --msgbox "ERROR: Detected error in 'HOOKS=' line, please correct HOOKS= in /etc/mkinitcpio.conf!" 18 70
+    else
+        run_mkinitcpio
     fi
 }
 
@@ -54,6 +56,7 @@ set_locale() {
         sed -i -e "s/^#${i}/${i}/g" "${DESTDIR}"/etc/locale.gen
     done
     sleep 2
+    run_locale_gen
 }
 
 set_password() {