From: Ray Strode <rstrode@redhat.com>
Date: Mon, 9 Apr 2012 18:27:44 +0000 (-0400)
Subject: main: only force details if system has non-tty0 console
X-Git-Tag: 0.8.5~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3af9feed39a24efff7f785cdba6e4aab8e2260d;p=thirdparty%2Fplymouth.git

main: only force details if system has non-tty0 console

Right now we're unconditionally forcing details mode,
which is clearly wrong.
---

diff --git a/src/main.c b/src/main.c
index 840ef08e..27aabd3b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1909,8 +1909,6 @@ add_consoles_from_file (state_t         *state,
       size_t console_length;
       char *console_device;
 
-      state->should_force_details = true;
-
       console = strdup (remaining_command_line);
 
       end = strpbrk (console, " \n\t\v");
@@ -1924,6 +1922,13 @@ add_consoles_from_file (state_t         *state,
           break;
         }
 
+      /* if we are in a weird case force details,
+       * so the user probably doesn't care about
+       * graphical splashes
+       */
+      if (strcmp (console, "tty0") != 0)
+        state->should_force_details = true;
+
       console_length = strlen (console);
 
       asprintf (&console_device, "/dev/%s", console);