Always show Supplemental Packs dialog if Driver Disks are used.

In interactive mode, when Driver Disks are used as local media, they must *also* be installed as Supplemental Packs after installation. This change remembers the use of Driver Disks and makes sure the question is asked, even when the supplemental-packs feature is disabled. Signed-off-by: Yann Dirson <[email protected]>
xenserver · Oct 31, 2023 · 9db0dde · 9db0dde
1 parent 3ca3be0
commit 9db0dde
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/backend.py b/backend.py
@@ -421,7 +421,8 @@ def add_repos(main_repositories, update_repositories, repos):
         if r.accessor().canEject():
             r.accessor().eject()
 
-    if interactive and constants.HAS_SUPPLEMENTAL_PACKS:
+    if interactive and (constants.HAS_SUPPLEMENTAL_PACKS or
+                        "driver-repos" in answers):
         # Add supp packs in a loop
         while True:
             media_ans = dict(answers_pristine)

diff --git a/doc/features.txt b/doc/features.txt
@@ -14,3 +14,7 @@ Currently available feature flags are:
 
     This only impacts the UI, the <source> answerfile construct still
     allows to include supplemental packs without this feature flag.
+
+    This also has no impact if users previously load a driver disk:
+    they will get the opportunity to insert it again to get the driver
+    installed on the host.
diff --git a/tui/installer/screens.py b/tui/installer/screens.py
@@ -99,6 +99,9 @@ def fn10():
             tui.fcoe.select_fcoe_ifaces(answers)
             tui.update_help_line([None, "<F9> load driver"])
 
+    if driver_answers['driver-repos']:
+        answers['driver-repos'] = driver_answers['driver-repos']
+
     tui.screen.popHelpLine()
 
     if button == 'reboot':