service: drop redundant check in sysv_translate_facility

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 3291561e099bbacc0d45bec83013ae47d523b7e4..a041a22edaf819a44fa9186ab9ef38a35ab519d8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -41,6 +41,7 @@
 #include "kmod-setup.h"
 #include "locale-setup.h"
 #include "selinux-setup.h"
+#include "machine-id-setup.h"
 #include "load-fragment.h"
 #include "fdset.h"
 #include "special.h"
@@ -941,15 +942,12 @@ static void test_mtab(void) {
 }
 
 static void test_usr(void) {
-        struct stat a, b;
         bool separate = false;
 
         /* Check that /usr is not a separate fs */
 
-        if (lstat("/", &a) >= 0 && lstat("/usr", &b) >= 0)
-                if (a.st_dev != b.st_dev)
-                        separate = true;
-
+        if (path_is_mount_point("/usr") > 0)
+                separate = true;
         /* This check won't work usually during boot, since /usr is
          * probably not mounted yet, hence let's add a second
          * check. We just check whether /usr is an empty directory. */
@@ -1130,6 +1128,7 @@ int main(int argc, char *argv[]) {
 
                 kmod_setup();
                 hostname_setup();
+                machine_id_setup();
                 loopback_setup();
 
                 mkdir_p("/dev/.systemd/ask-password/", 0755);