cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix the start as root, non chroot distant case, by making it chroot /

Browse Source
This commit is contained in:
espie 2015-05-12 19:47:47 +00:00
parent 01699a3d54
commit 635973b622
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
infrastructure/lib/DPB/Shell.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Shell.pm,v 1.9 2015/05/08 12:35:53 espie Exp $
# $OpenBSD: Shell.pm,v 1.10 2015/05/12 19:47:47 espie Exp $
#
# Copyright (c) 2010-2014 Marc Espie <espie@openbsd.org>
#
@ -127,6 +127,9 @@ sub exec
if ($self->{nochroot}) {
undef $chroot;
}
if ($self->prop->{iamroot}) {
$chroot //= '/';
}
unshift @argv, 'exec' unless $self->{as_root} && !$chroot;
if ($self->{env}) {
while (my ($k, $v) = each %{$self->{env}}) {
@ -154,7 +157,8 @@ sub exec
if (!$self->{as_root} && defined $self->{user}) {
push(@cmd2, "-u", $self->{user}->user);
}
$self->_run(@cmd2, $chroot, "/bin/sh", "-c", $self->quote($cmd));
$self->_run(@cmd2, $chroot, "/bin/sh", "-c",
$self->quote($cmd));
} else {
$self->_run($cmd);
}