diff options
| author | Emil Renner Berthing <systemd@esmil.dk> | 2014-09-18 15:24:55 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-10-10 13:00:47 +0200 |
| commit | 0fff82e5f867f9494ed631736964d9abfe672673 (patch) | |
| tree | 19c3ab2bc3c258c3dcee65caa40dffb5b6ec06ac | |
| parent | 9f103625b145a397e67c3714766775b615c8b587 (diff) | |
mount-setup: skip relabelling when SELinux and SMACK not supported
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.
| -rw-r--r-- | src/core/mount-setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index 23a66d2e95..8e91217828 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -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 |