From 4c8373b4a3794d160de4455b5690de20c7ce7edc Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sat, 1 Jun 2024 12:43:41 +0200
Subject: [PATCH] add usermanagement

---
 usr/lib/archboot/installer/base.sh          | 1 -
 usr/lib/archboot/installer/configuration.sh | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/usr/lib/archboot/installer/base.sh b/usr/lib/archboot/installer/base.sh
index fd7787b2c..5f946a968 100644
--- a/usr/lib/archboot/installer/base.sh
+++ b/usr/lib/archboot/installer/base.sh
@@ -188,7 +188,6 @@ _configure_system() {
             _run_locale_gen
         elif [[ "${_FILE}" = "Basic User Configuration" ]]; then
             _user_management
-            _set_password
         else
             ${_EDITOR} "${_DESTDIR}""${_FILE}"
         fi
diff --git a/usr/lib/archboot/installer/configuration.sh b/usr/lib/archboot/installer/configuration.sh
index df8445880..60784c515 100644
--- a/usr/lib/archboot/installer/configuration.sh
+++ b/usr/lib/archboot/installer/configuration.sh
@@ -56,12 +56,12 @@ _check_root_password() {
     if chroot "${_DESTDIR}" passwd -S root | cut -d ' ' -f2 | grep -q NP; then
         _dialog --no-mouse --infobox "Setup detected no password set for root user,\nplease set new password now." 6 50
         sleep 3
-        _set_password || return 1
+        _set_password Root root || return 1
     fi
     # check if account is locked
     if chroot "${_DESTDIR}" passwd -S root | cut -d ' ' -f2 | grep -q L; then
         _dialog --no-mouse --infobox "Setup detected locked account for root user,\nplease set new password to unlock account now." 6 50
-        _set_password || return 1
+        _set_password Root root || return 1
     fi
 }