chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: print warning on console before reboot
[elogind.git]
/
src
/
core
/
namespace.c
diff --git
a/src/core/namespace.c
b/src/core/namespace.c
index f76d3891c387678cb4bac5f4b75a2588341b9d39..4bc288de1d5065e6a51a45b351a2469743d03f77 100644
(file)
--- a/
src/core/namespace.c
+++ b/
src/core/namespace.c
@@
-225,9
+225,9
@@
static int mount_dev(BindMount *m) {
goto fail;
}
goto fail;
}
-
label_context_set
(d, st.st_mode);
+
mac_selinux_create_file_prepare
(d, st.st_mode);
r = mknod(dn, st.st_mode, st.st_rdev);
r = mknod(dn, st.st_mode, st.st_rdev);
-
label_context
_clear();
+
mac_selinux_create_file
_clear();
if (r < 0) {
r = -errno;
if (r < 0) {
r = -errno;
@@
-263,11
+263,8
@@
fail:
if (devmqueue)
umount(devmqueue);
if (devmqueue)
umount(devmqueue);
- if (dev) {
- umount(dev);
- rmdir(dev);
- }
-
+ umount(dev);
+ rmdir(dev);
rmdir(temporary_mount);
return r;
rmdir(temporary_mount);
return r;
@@
-341,11
+338,8
@@
fail:
unlink(busnode);
}
unlink(busnode);
}
- if (root) {
- umount(root);
- rmdir(root);
- }
-
+ umount(root);
+ rmdir(root);
rmdir(temporary_mount);
return r;
rmdir(temporary_mount);
return r;
@@
-430,9
+424,9
@@
int setup_namespace(
char** read_write_dirs,
char** read_only_dirs,
char** inaccessible_dirs,
char** read_write_dirs,
char** read_only_dirs,
char** inaccessible_dirs,
- char* tmp_dir,
- char* var_tmp_dir,
- char* bus_endpoint_path,
+ c
onst c
har* tmp_dir,
+ c
onst c
har* var_tmp_dir,
+ c
onst c
har* bus_endpoint_path,
bool private_dev,
ProtectHome protect_home,
ProtectSystem protect_system,
bool private_dev,
ProtectHome protect_home,
ProtectSystem protect_system,