summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2014-01-24 14:29:31 -0500
committerRay Strode <rstrode@redhat.com>2014-01-24 14:34:36 -0500
commit382305e4a9f7b4c221968fcba7394b1cc03b454e (patch)
treef456373b03a8bd963085fb44c538e5d66988ffe9
parent785a0050c01567e3e9eaaf0534e7e52045fc4a9d (diff)
main: disable hotplug events and splash delay if details forced
There's no point in waiting for a graphics device if details are forced, and we shouldn't ever delay showing details. If details are requested, we shouldn't be hiding them.
-rw-r--r--src/main.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index 2ccb8eca..43e3a0a5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2306,6 +2306,15 @@ main (int argc,
(getenv ("DISPLAY") != NULL))
device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_UDEV;
+ if (!plymouth_should_show_default_splash (&state))
+ {
+ /* don't bother listening for udev events if we're forcing details */
+ device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_UDEV;
+
+ /* don't ever delay showing the detailed splash */
+ state.splash_delay = NAN;
+ }
+
load_devices (&state, device_manager_flags);
ply_trace ("entering event loop");