]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
[daemon] splash=verbose is equivalent to no splash (splashy compatibility)
authorFrederic Crozat <fcrozat@mandriva.com>
Tue, 1 Sep 2009 16:36:11 +0000 (18:36 +0200)
committerFrederic Crozat <fcrozat@mandriva.com>
Tue, 1 Sep 2009 17:01:28 +0000 (19:01 +0200)
src/main.c

index ba4ade3dc1226ee7c84a8edb4403854b2a179337..a92e11f20774b61ce052ffcd69ae92a8349b2eee 100644 (file)
@@ -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