From: Ray Strode <rstrode@redhat.com>
Date: Tue, 10 Dec 2013 02:07:16 +0000 (-0500)
Subject: main: provide way to toggle udev device enumeration off
X-Git-Tag: 0.9.0~65^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=487092edd46358beea32314cc33e2fd24f66a24a;p=thirdparty%2Fplymouth.git

main: provide way to toggle udev device enumeration off

We don't want to use udev for device enumeration if:

1) DISPLAY is set (since we're going to use the X11 renderer)
2) if it's disabled explicitly on the kernel command line

This commit adds support for those two things.
---

diff --git a/src/main.c b/src/main.c
index b1dee587..50062951 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2200,6 +2200,10 @@ main (int    argc,
   if (command_line_has_argument (state.kernel_command_line, "plymouth.ignore-serial-consoles"))
     device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES;
 
+  if (command_line_has_argument (state.kernel_command_line, "plymouth.ignore-udev") ||
+      (getenv ("DISPLAY") != NULL))
+    device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_UDEV;
+
   load_devices (&state, device_manager_flags);
 
   ply_trace ("entering event loop");