Merge branch 'driver-disks'

* driver-disks:
  Clarify Supplemental Packs dialog in presence of Driver Disks
  Always show Supplemental Packs dialog if Driver Disks are used.

backend.py

@@ -450,7 +450,8 @@ def add_repos(main_repositories, update_repositories, repos, repo_gpgcheck, gpgc
         for device in getRemovableDeviceList():
             util.runCmd2(['eject', device])
 
-    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)

doc/features.txt

@@ -15,6 +15,10 @@ 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.
+
   large-block-capable-sr-type
 
     Allow the use of an SR type for local storage that (unlike "lvm" and

tui/installer/screens.py

@@ -123,6 +123,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':
@@ -526,10 +529,14 @@ def confirm_erase_volume_groups(answers):
     return RIGHT_FORWARDS
 
 def use_extra_media(answers):
+    message = "Would you like to install any Supplemental Packs?"
+    if "driver-repos" in answers:
+        message += ("  You previously loaded one or more Driver Disks, if you wish to"
+                    " include these drivers on the installed system, you must install them now.")
     rc = snackutil.ButtonChoiceWindowEx(
         tui.screen,
         "Supplemental Packs",
-        "Would you like to install any Supplemental Packs?",
+        message,
         ['Yes', 'No'],
         default=1, help='suppack'
         )