diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:58:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:58:37 +0000 |
| commit | 9690a92a495086ded1e1a95f2cd4a9247d9035d6 (patch) | |
| tree | 3bfa7968ee405064e4b1b42a6201b8fbcb4a08c5 /lib | |
| parent | Adding debian version 0.85.10. (diff) | |
| download | sbuild-9690a92a495086ded1e1a95f2cd4a9247d9035d6.tar.xz sbuild-9690a92a495086ded1e1a95f2cd4a9247d9035d6.zip | |
Merging upstream version 0.85.11.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | lib/Sbuild/Build.pm | 2 | ||||
| -rw-r--r-- | lib/Sbuild/ChrootUnshare.pm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm index 7a23a85..0deabbd 100644 --- a/lib/Sbuild/Build.pm +++ b/lib/Sbuild/Build.pm @@ -827,7 +827,7 @@ sub run_fetch_install_packages { $self->set('Install End Time', $self->get('Install Start Time')); my @coredeps = @{$self->get_conf('CORE_DEPENDS')}; if ($self->get_conf('CHROOT_MODE') eq 'unshare') { - push(@coredeps, 'dumb-init'); + push(@coredeps, 'dumb-init:native'); } if ($self->get('Host Arch') ne $self->get('Build Arch')) { my $crosscoredeps = $self->get_conf('CROSSBUILD_CORE_DEPENDS'); diff --git a/lib/Sbuild/ChrootUnshare.pm b/lib/Sbuild/ChrootUnshare.pm index 81e90ca..f4b9c41 100644 --- a/lib/Sbuild/ChrootUnshare.pm +++ b/lib/Sbuild/ChrootUnshare.pm @@ -407,7 +407,7 @@ sub useradd { my $rootdir = $self->get('Session ID'); my @idmap = read_subuid_subgid; my @unshare_cmd = get_unshare_cmd({IDMAP => \@idmap}); - return system(@unshare_cmd, "/usr/sbin/useradd", "--root", $rootdir, @args); + return system(@unshare_cmd, "/usr/sbin/useradd", "--no-log-init", "--prefix", $rootdir, @args); } sub groupadd { @@ -416,7 +416,7 @@ sub groupadd { my $rootdir = $self->get('Session ID'); my @idmap = read_subuid_subgid; my @unshare_cmd = get_unshare_cmd({IDMAP => \@idmap}); - return system(@unshare_cmd, "/usr/sbin/groupadd", "--root", $rootdir, @args); + return system(@unshare_cmd, "/usr/sbin/groupadd", "--prefix", $rootdir, @args); } 1; |