X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-ns.c;h=7cd7b77153f484e580e032ed999526e03825eff5;hb=0e707326fcecd3968efa7dc827123032f1b2cb61;hp=b1c759fc20add3ff7ac0ea59d1aa5b2e7ddd0316;hpb=f274ece0f76b5709408821e317e87aef76123db6;p=elogind.git diff --git a/src/test/test-ns.c b/src/test/test-ns.c index b1c759fc2..7cd7b7715 100644 --- a/src/test/test-ns.c +++ b/src/test/test-ns.c @@ -26,6 +26,7 @@ #include #include "namespace.h" +#include "execute.h" #include "log.h" int main(int argc, char *argv[]) { @@ -47,15 +48,29 @@ int main(int argc, char *argv[]) { }; int r; + char tmp_dir[] = "/tmp/systemd-private-XXXXXX", + var_tmp_dir[] = "/var/tmp/systemd-private-XXXXXX"; - r = setup_namespace((char**) writable, (char**) readonly, (char**) inaccessible, true, 0); + assert_se(mkdtemp(tmp_dir)); + assert_se(mkdtemp(var_tmp_dir)); + + r = setup_namespace((char **) writable, + (char **) readonly, + (char **) inaccessible, + tmp_dir, + var_tmp_dir, + NULL, + true, + PROTECT_HOME_NO, + PROTECT_SYSTEM_NO, + 0); if (r < 0) { - log_error("Failed to setup namespace: %s", strerror(-r)); + log_error_errno(r, "Failed to setup namespace: %m"); return 1; } execl("/bin/sh", "/bin/sh", NULL); - log_error("execl(): %m"); + log_error_errno(errno, "execl(): %m"); return 1; }