chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify execute_directory()
[elogind.git]
/
src
/
core
/
namespace.c
diff --git
a/src/core/namespace.c
b/src/core/namespace.c
index 32338cdc60a59e446577590a9de531c03e601c5c..4b8dbdd0d83d975a2e5f135d280d05f056047f98 100644
(file)
--- a/
src/core/namespace.c
+++ b/
src/core/namespace.c
@@
-35,7
+35,6
@@
#include "strv.h"
#include "util.h"
#include "path-util.h"
#include "strv.h"
#include "util.h"
#include "path-util.h"
-#include "namespace.h"
#include "missing.h"
#include "execute.h"
#include "loopback-setup.h"
#include "missing.h"
#include "execute.h"
#include "loopback-setup.h"
@@
-43,6
+42,8
@@
#include "dev-setup.h"
#include "def.h"
#include "label.h"
#include "dev-setup.h"
#include "def.h"
#include "label.h"
+#include "selinux-util.h"
+#include "namespace.h"
typedef enum MountMode {
/* This is ordered by priority! */
typedef enum MountMode {
/* This is ordered by priority! */
@@
-276,10
+277,8
@@
static int mount_kdbus(BindMount *m) {
u = umask(0000);
u = umask(0000);
- if (!mkdtemp(temporary_mount)) {
- log_error_errno(errno, "Failed create temp dir: %m");
- return -errno;
- }
+ if (!mkdtemp(temporary_mount))
+ return log_error_errno(errno, "Failed create temp dir: %m");
root = strappenda(temporary_mount, "/kdbus");
(void)mkdir(root, 0755);
root = strappenda(temporary_mount, "/kdbus");
(void)mkdir(root, 0755);
@@
-423,7
+422,7
@@
int setup_namespace(
bool private_dev,
ProtectHome protect_home,
ProtectSystem protect_system,
bool private_dev,
ProtectHome protect_home,
ProtectSystem protect_system,
- unsigned mount_flags) {
+ unsigned
long
mount_flags) {
BindMount *m, *mounts = NULL;
unsigned n;
BindMount *m, *mounts = NULL;
unsigned n;