{ "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID, true },
{ "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV, true },
{ "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false },
- { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV, true },
{ "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV, false },
{ "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, false },
};
* we just list them here so that we know that we should ignore them */
static const char * const ignore_paths[] = {
+ "/sys/fs/selinux",
"/selinux",
- "/proc/bus/usb",
- "/var/lib/nfs/rpc_pipefs",
- "/proc/fs/nfsd"
+ "/proc/bus/usb"
};
bool mount_point_is_api(const char *path) {
/* Mount all available cgroup controllers that are built into the kernel. */
- if (!(f = fopen("/proc/cgroups", "re")))
- return -ENOENT;
+ if (!(f = fopen("/proc/cgroups", "re"))) {
+ log_error("Failed to enumerate cgroup controllers: %m");
+ return 0;
+ }
/* Ignore the header line */
(void) fgets(buf, sizeof(buf), f);
return 0;
};
-int mount_setup(void) {
+int mount_setup(bool loaded_policy) {
const char symlinks[] =
"/proc/kcore\0" "/dev/core\0"
* the appropriate labels, after mounting. The other virtual
* API file systems like /sys and /proc do not need that, they
* use the same label for all their files. */
- if (unlink("/dev/.systemd-relabel-run-dev") >= 0) {
+ if (loaded_policy) {
+ usec_t before_relabel, after_relabel;
+ char timespan[FORMAT_TIMESPAN_MAX];
+
+ before_relabel = now(CLOCK_MONOTONIC);
+
nftw("/dev", nftw_cb, 64, FTW_MOUNT|FTW_PHYS);
nftw("/run", nftw_cb, 64, FTW_MOUNT|FTW_PHYS);
+
+ after_relabel = now(CLOCK_MONOTONIC);
+
+ log_info("Relabelled /dev and /run in %s.",
+ format_timespan(timespan, sizeof(timespan), after_relabel - before_relabel));
+
}
/* Create a few default symlinks, which are normally created
/* Create a few directories we always want around */
mkdir("/run/systemd", 0755);
+ mkdir("/run/systemd/system", 0755);
return mount_cgroup_controllers();
}