use iurt_root_command to add user

2 files changed, 11 insertions, 1 deletions

diff --git a/iurt_root_command b/iurt_root_command
index 05b6cdc..d9d20fa 100755
--- a/iurt_root_command
+++ b/iurt_root_command
@@ -138,6 +138,9 @@ $run{todo} = [];
     [ "", "umount", 1, "<directory>]", 
     "umount the given directory", 
     \&umount, "Unmounting" ],
+    [ "", "useradd", 3, "<directory> <username> [uid]", 
+    "Add user in given chroot", 
+    \&useradd, "Useradd" ],
 );
 
 open(my $LOG, ">&STDERR");
@@ -361,3 +364,9 @@ sub umount {
     check_path_authorized($dir) or return;
     return !system("umount", $dir);
 }
+
+sub useradd {
+    my ($_run, $dir, $username, $o_uid) = @_;
+    check_path_authorized($dir) or return;
+    return !system('chroot', $dir, 'useradd', if_($o_uid, '-o', '--uid', $o_uid), $username);
+}
diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index ba7227e..91ff0f1 100644
--- a/lib/Iurt/Chroot.pm
+++ b/lib/Iurt/Chroot.pm
@@ -556,7 +556,8 @@ sub build_chroot {
     #
     # CM: Choose a sub-500 uid to prevent collison with $luser
     #
-    system($sudo, 'chroot', $tmp_chroot, 'adduser', '-o', '--uid', 499, 'builder');
+    sudo($run, $config, "--useradd", $tmp_chroot, 'builder', 499);
+
     # FIXME: <mrl> Be careful! Damn ugly hack right below!
     sudo($run, $config, "--rm", "$tmp_chroot/var/lib/rpm/__db*");
     sudo($run, $config, "--umount", "$tmp_chroot/proc");