X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmain.c;h=3291561e099bbacc0d45bec83013ae47d523b7e4;hb=aa1671320df5bd8aa4108c0efb34a49fdedd0e5f;hp=96a282a34fe7c35281dd3f2e5f5aca8ae9b51722;hpb=934da0359966a77ff4f1505a4663e34aa434f4d3;p=elogind.git

diff --git a/src/main.c b/src/main.c
index 96a282a34..3291561e0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -858,7 +858,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 +923,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 +935,34 @@ 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) {
+        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.");
 }
 
 int main(int argc, char *argv[]) {
@@ -948,7 +975,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;
@@ -1012,6 +1039,11 @@ int main(int argc, char *argv[]) {
         if (parse_argv(argc, argv) < 0)
                 goto finish;
 
+        if (arg_action == ACTION_TEST && geteuid() == 0) {
+                log_error("Don't run test mode as root.");
+                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)
@@ -1103,6 +1135,7 @@ int main(int argc, char *argv[]) {
                 mkdir_p("/dev/.systemd/ask-password/", 0755);
 
                 test_mtab();
+                test_usr();
         }
 
         if ((r = manager_new(arg_running_as, &m)) < 0) {