lookup: always also look into /usr/lib for units

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

diff --git a/src/mount-setup.c b/src/mount-setup.c
index 056e4a1c6c016d9d6ab88245220908c3d7b7e02c..a42ed439571370a9899887fc91b60decbc477a8a 100644 (file)
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -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;
@@ -242,8 +243,10 @@ int mount_setup(void) {
          * appropriate labels, after mounting. The other virtual API
          * file systems do not need. */
 
-        if (unlink("/dev/.systemd-relabel-devtmpfs") >= 0)
+        if (unlink("/dev/.systemd-relabel-run-dev") >= 0) {
                 nftw("/dev", nftw_cb, 64, FTW_MOUNT|FTW_PHYS);
+                nftw("/run", nftw_cb, 64, FTW_MOUNT|FTW_PHYS);
+        }
 
         /* Create a few default symlinks, which are normally created
          * bei udevd, but some scripts might need them before we start