getty: do not auto-spawn getty's on VC ttys if console=ttyN is used

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 99e277c67b9fd290bd4095425344c852e62e529e..d1eeffb12ee0b23f70d1af1686bed0e22f3e7bf1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -899,7 +899,7 @@ static void test_mtab(void) {
         if (readlink_malloc("/etc/mtab", &p) >= 0) {
                 bool b;
 
-                b = streq(p, "/proc/self/mounts");
+                b = streq(p, "/proc/self/mounts") || streq(p, "/proc/mounts");
                 free(p);
 
                 if (b)
@@ -985,6 +985,11 @@ int main(int argc, char *argv[]) {
         if (parse_argv(argc, argv) < 0)
                 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)
+                arg_show_status = true;
+
         if (arg_action == ACTION_HELP) {
                 retval = help();
                 goto finish;