X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmain.c;h=a041a22edaf819a44fa9186ab9ef38a35ab519d8;hp=d1be83d44f9eb774025e5c8ccf18e7dc23eb8dbd;hb=b4353094e5097c0cb149b5adcffe2a6ba9240283;hpb=b5c6cf87342bedeb67fbbc4f3f512af1603a461c

diff --git a/src/main.c b/src/main.c
index d1be83d44..a041a22ed 100644
--- 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"
@@ -858,7 +859,7 @@ static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds) {
         assert(_fds);
 
         if ((r = manager_open_serialization(m, &f)) < 0) {
-                log_error("Failed to create serialization faile: %s", strerror(-r));
+                log_error("Failed to create serialization file: %s", strerror(-r));
                 goto fail;
         }
 
@@ -923,6 +924,8 @@ static struct dual_timestamp* parse_initrd_timestamp(struct dual_timestamp *t) {
 static void test_mtab(void) {
         char *p;
 
+        /* Check that /etc/mtab is a symlink */
+
         if (readlink_malloc("/etc/mtab", &p) >= 0) {
                 bool b;
 
@@ -933,9 +936,31 @@ static void test_mtab(void) {
                         return;
         }
 
-        log_error("/etc/mtab is not a symlink or not pointing to /proc/self/mounts. "
-                  "This is not supported anymore. "
-                  "Please make sure to replace this file by a symlink to avoid incorrect or misleading mount(8) output.");
+        log_warning("/etc/mtab is not a symlink or not pointing to /proc/self/mounts. "
+                    "This is not supported anymore. "
+                    "Please make sure to replace this file by a symlink to avoid incorrect or misleading mount(8) output.");
+}
+
+static void test_usr(void) {
+        bool separate = false;
+
+        /* Check that /usr is not a separate fs */
+
+        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. */
+
+        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.");
 }
 
 int main(int argc, char *argv[]) {
@@ -948,7 +973,7 @@ int main(int argc, char *argv[]) {
         char systemd[] = "systemd";
 
         if (getpid() != 1 && strstr(program_invocation_short_name, "init")) {
-                /* This is compatbility support for SysV, where
+                /* This is compatibility support for SysV, where
                  * calling init as a user is identical to telinit. */
 
                 errno = -ENOENT;
@@ -1103,11 +1128,13 @@ 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();
         }
 
         if ((r = manager_new(arg_running_as, &m)) < 0) {