From: Frederic Crozat <fcrozat@mandriva.com>
Date: Tue, 1 Sep 2009 16:36:11 +0000 (+0200)
Subject: [daemon] splash=verbose is equivalent to no splash (splashy compatibility)
X-Git-Tag: 0.7.2~24^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=267008cd21da4efb85dec0702bbbd7d5d7dddd4e;p=thirdparty%2Fplymouth.git

[daemon] splash=verbose is equivalent to no splash (splashy compatibility)
---

diff --git a/src/main.c b/src/main.c
index ba4ade3d..a92e11f2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -562,7 +562,7 @@ plymouth_should_show_default_splash (state_t *state)
         }
     }
 
-  return strstr (state->kernel_command_line, "rhgb") != NULL || strstr (state->kernel_command_line, "splash") != NULL;
+  return strstr (state->kernel_command_line, "rhgb") != NULL || (strstr (state->kernel_command_line, "splash") != NULL && strstr(state->kernel_command_line, "splash=verbose") == NULL);
 }
 
 static void