load-fragment: unify config_parse_condition_{kernel, virt}

[elogind.git] / src / mount-setup.c

diff --git a/src/mount-setup.c b/src/mount-setup.c
index d740d4f3570bedd34a7deea0dc636bdb2e54e3c0..49eab0bfa72ef5b148d53f70ae9582415207f351 100644 (file)
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -54,7 +54,7 @@ static const MountPoint mount_table[] = {
         { "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",    "/dev/.run",              "tmpfs",    "mode=755",          MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+        { "tmpfs",    "/run",                   "tmpfs",    "mode=755",          MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
         { "tmpfs",    "/sys/fs/cgroup",         "tmpfs",    "mode=755",          MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
         { "cgroup",   "/sys/fs/cgroup/systemd", "cgroup",   "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
 };
@@ -101,7 +101,7 @@ static int mount_one(const MountPoint *p) {
                 return r;
 
         if (r > 0)
-                return 0;
+                goto finish;
 
         /* The access mode here doesn't really matter too much, since
          * the mounted file system will take precedence anyway. */
@@ -122,6 +122,7 @@ static int mount_one(const MountPoint *p) {
                 return p->fatal ? -errno : 0;
         }
 
+finish:
         label_fix(p->where, false);
 
         return 0;
@@ -253,8 +254,8 @@ int mount_setup(void) {
                 symlink_and_label(j, k);
 
         /* Create a few directories we always want around */
-        mkdir("/dev/.run/systemd", 0755);
-        mkdir("/dev/.run/systemd/ask-password", 0755);
+        mkdir("/run/systemd", 0755);
+        mkdir("/run/systemd/ask-password", 0755);
 
         return mount_cgroup_controllers();
 }