From 9e47b7aa3a56c0732ffaccec5aa5d0692538683f Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Fri, 24 Jan 2020 09:39:22 +0100
Subject: [PATCH] setcap on "$sysroot"/usr/bin/newgidmap
 "$sysroot"/usr/bin/newuidmap

---
 prepare-root.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/prepare-root.sh b/prepare-root.sh
index 5462d0d..4de582d 100755
--- a/prepare-root.sh
+++ b/prepare-root.sh
@@ -479,7 +479,8 @@ sed -i -e 's#/etc/passwd#/cfg/passwd#g;s#/etc/shadow#/cfg/shadow#g;s#/etc/gshado
     "$sysroot"/usr/bin/newuidmap \
     "$sysroot"/usr/sbin/newusers
 
-chmod u+s "$sysroot"/usr/bin/newgidmap "$sysroot"/usr/bin/newuidmap
+setcap 'cap_setgid+ep' "$sysroot"/usr/bin/newgidmap \
+       'cap_setuid+ep' "$sysroot"/usr/bin/newuidmap
 
 sed -i -e 's#/etc/.pwd.lock#/cfg/.pwd.lock#g' \
     "$sysroot"/lib*/libc.so.* \