chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: set default working directory to the user's home directory when running in...
[elogind.git]
/
src
/
core
/
mount-setup.c
diff --git
a/src/core/mount-setup.c
b/src/core/mount-setup.c
index cdbee1440827f99dcd0adc393f9bde773ffbbd4a..07794df049adb65da3c8fe6e8c7add99973ac408 100644
(file)
--- a/
src/core/mount-setup.c
+++ b/
src/core/mount-setup.c
@@
-121,7
+121,7
@@
static int mount_one(const MountPoint *p, bool relabel) {
/* Relabel first, just in case */
if (relabel)
/* Relabel first, just in case */
if (relabel)
- label_fix(p->where, true);
+ label_fix(p->where, true
, true
);
if ((r = path_is_mount_point(p->where, true)) < 0)
return r;
if ((r = path_is_mount_point(p->where, true)) < 0)
return r;
@@
-150,7
+150,7
@@
static int mount_one(const MountPoint *p, bool relabel) {
/* Relabel again, since we now mounted something fresh here */
if (relabel)
/* Relabel again, since we now mounted something fresh here */
if (relabel)
- label_fix(p->where, false);
+ label_fix(p->where, false
, false
);
return 1;
}
return 1;
}
@@
-347,7
+347,7
@@
static int nftw_cb(
if (_unlikely_(ftwbuf->level == 0))
return FTW_CONTINUE;
if (_unlikely_(ftwbuf->level == 0))
return FTW_CONTINUE;
- label_fix(fpath,
tru
e);
+ label_fix(fpath,
false, fals
e);
/* /run/initramfs is static data and big, no need to
* dynamically relabel its contents at boot... */
/* /run/initramfs is static data and big, no need to
* dynamically relabel its contents at boot... */
@@
-391,7
+391,7
@@
int mount_setup(bool loaded_policy) {
/* Explicitly relabel these */
NULSTR_FOREACH(j, relabel)
/* Explicitly relabel these */
NULSTR_FOREACH(j, relabel)
- label_fix(j, true);
+ label_fix(j, true
, false
);
after_relabel = now(CLOCK_MONOTONIC);
after_relabel = now(CLOCK_MONOTONIC);