chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 37d0998e5e90ea4b0dfe25a557ff3bc337b01826..76b131c284449b6c95d1e2a3165f7f1a62b5c8f8 100644
(file)
--- a/
src/test/test-ns.c
+++ b/
src/test/test-ns.c
@@
-20,13
+20,9
@@
***/
#include <stdlib.h>
***/
#include <stdlib.h>
-#include <string.h>
#include <unistd.h>
#include <unistd.h>
-#include <sys/mount.h>
-#include <linux/fs.h>
#include "namespace.h"
#include "namespace.h"
-#include "execute.h"
#include "log.h"
int main(int argc, char *argv[]) {
#include "log.h"
int main(int argc, char *argv[]) {
@@
-59,14
+55,18
@@
int main(int argc, char *argv[]) {
(char **) inaccessible,
tmp_dir,
var_tmp_dir,
(char **) inaccessible,
tmp_dir,
var_tmp_dir,
+ NULL,
+ true,
+ PROTECT_HOME_NO,
+ PROTECT_SYSTEM_NO,
0);
if (r < 0) {
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);
return 1;
}
execl("/bin/sh", "/bin/sh", NULL);
- log_error
(
"execl(): %m");
+ log_error
_errno(errno,
"execl(): %m");
return 1;
}
return 1;
}