[master/rhel7] driver-updates: skip iso selection with OEMDRV (#1066784)

Brian C. Lane bcl at redhat.com
Tue Mar 4 18:58:14 UTC 2014


If there is an OEMDRV inst.dd selects the drivers, not the device.
And if there is no inst.dd iso selection should not be run.

Related: rhbz#1066784
---
 dracut/driver-updates | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dracut/driver-updates b/dracut/driver-updates
index 0c81a56..b0ce4bc 100755
--- a/dracut/driver-updates
+++ b/dracut/driver-updates
@@ -741,7 +741,11 @@ def dd_scan(skip_dds=set(), scan_dd_args=True):
     dd_finished = dd_load(dd_todo, skip_dds=skip_dds)
     skip_dds.update(dd_finished)
 
-    # Handle interactive driver selection, if needed
+    # Skip interactive selection of an iso if OEMDRV was found
+    if skip_dds or not is_interactive():
+        return
+
+    # Handle interactive driver selection
     mount_point = None
     while True:
         iso, mount_point = select_iso()
-- 
1.8.5.3



More information about the anaconda-patches mailing list