From 84d7b7693d44a95d4aba4ea44bd768e2512d92cb Mon Sep 17 00:00:00 2001
From: donoban <donoban@riseup.net>
Date: Mon, 3 Jan 2022 20:32:55 +0100
Subject: [PATCH] rootbld: run mkusers inside the chroot and don't affect host
 users

---
 abuild.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
 mode change 100644 => 100755 abuild.in

diff --git a/abuild.in b/abuild.in
old mode 100644
new mode 100755
index b2a7d72..f2e6db7
--- a/abuild.in
+++ b/abuild.in
@@ -2362,7 +2362,7 @@ rootbld_actions() {
 	if ! want_check; then
 		_check=true
 	fi
-	for part in symlinksrc unpack prepare build $_check rootpkg; do
+	for part in symlinksrc unpack prepare mkusers build $_check rootpkg; do
 		runpart $part
 	done
 }
@@ -2395,8 +2395,6 @@ rootbld() {
 
 	msg "Preparing build chroot..."
 
-	mkusers
-
 	BUILD_ROOT=$(mktemp -d /var/tmp/abuild.XXXXXXXXXX)
 
 	mkdir -p "$BUILD_ROOT/proc" "$BUILD_ROOT/etc/apk/keys" \