fsckd: the error code is actually returned in 'fd'

[elogind.git] / src / test / test-ns.c

diff --git a/src/test/test-ns.c b/src/test/test-ns.c
index b1c759fc20add3ff7ac0ea59d1aa5b2e7ddd0316..76b131c284449b6c95d1e2a3165f7f1a62b5c8f8 100644 (file)
--- a/src/test/test-ns.c
+++ b/src/test/test-ns.c
@@ -20,10 +20,7 @@
 ***/
 
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
-#include <sys/mount.h>
-#include <linux/fs.h>
 
 #include "namespace.h"
 #include "log.h"
@@ -47,15 +44,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;
 }