pam: do not leak file descriptor if flock fails

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 3291561e099bbacc0d45bec83013ae47d523b7e4..6d1fd7d55d834f5dca74e38e4416c1f26948f535 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,28 +942,13 @@ 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;
-
-        /* 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. */
-
         if (dir_is_empty("/usr") > 0)
-                separate = true;
-
-        if (!separate)
-                return;
-
-        log_warning("/usr appears to be on a different file system than /. This is not supported anymore. "
-                    "Some things will probably break (sometimes even silently) in mysterious ways. "
-                    "Consult http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken for more information.");
+                log_warning("/usr appears to be on a different file system than /. This is not supported anymore. "
+                            "Some things will probably break (sometimes even silently) in mysterious ways. "
+                            "Consult http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken for more information.");
 }
 
 int main(int argc, char *argv[]) {
@@ -1044,6 +1030,13 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        if (arg_running_as == MANAGER_SYSTEM &&
+            arg_action == ACTION_RUN &&
+            running_in_chroot() > 0) {
+                log_error("Cannot be run in a chroot() environment.");
+                goto finish;
+        }
+
         /* If Plymouth is being run make sure we show the status, so
          * that there's something nice to see when people press Esc */
         if (access("/dev/.systemd/plymouth", F_OK) >= 0)
@@ -1130,10 +1123,9 @@ int main(int argc, char *argv[]) {
 
                 kmod_setup();
                 hostname_setup();
+                machine_id_setup();
                 loopback_setup();
 
-                mkdir_p("/dev/.systemd/ask-password/", 0755);
-
                 test_mtab();
                 test_usr();
         }