picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mount-setup: skip relabelling when SELinux and SMACK not supported

Browse source 
This is also the only place where FTW_ACTIONRETVAL is used, so
this makes systemd compile without SELinux or SMACK support
when the standard library doesn't support this extension.
This commit is contained in:
Emil Renner Berthing 2014-09-18 15:24:55 +02:00 committed by Lennart Poettering
parent 9f103625b1
commit 0fff82e5f8
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/mount-setup.c
View file

@ -351,6 +351,7 @@ int mount_cgroup_controllers(char ***join_controllers) {
return 0;
}
#if defined(HAVE_SELINUX) || defined(HAVE_SMACK)
static int nftw_cb(
const char *fpath,
const struct stat *sb,
@ -372,6 +373,7 @@ static int nftw_cb(
return FTW_CONTINUE;
};
#endif
int mount_setup(bool loaded_policy) {
int r;
@ -384,6 +386,7 @@ int mount_setup(bool loaded_policy) {
return r;
}
#if defined(HAVE_SELINUX) || defined(HAVE_SMACK)
/* Nodes in devtmpfs and /run need to be manually updated for
* the appropriate labels, after mounting. The other virtual
* API file systems like /sys and /proc do not need that, they
@ -402,6 +405,7 @@ int mount_setup(bool loaded_policy) {
log_info("Relabelled /dev and /run in %s.",
format_timespan(timespan, sizeof(timespan), after_relabel - before_relabel, 0));
}
#endif
/* Create a few default symlinks, which are normally created
* by udevd, but some scripts might need them before we start