From 9db0ddee9bd3cda673094aedece030a5e831e9ed Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Wed, 18 Oct 2023 16:04:42 +0200 Subject: [PATCH 1/2] 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 --- backend.py | 3 ++- doc/features.txt | 4 ++++ tui/installer/screens.py | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/backend.py b/backend.py index 5bcbefa5..09467a27 100644 --- 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 index 57e656d7..6f240e7b 100644 --- a/doc/features.txt +++ b/doc/features.txt @@ -14,3 +14,7 @@ Currently available feature flags are: This only impacts the UI, the 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 index ceac8669..28247cc5 100644 --- 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, " load driver"]) + if driver_answers['driver-repos']: + answers['driver-repos'] = driver_answers['driver-repos'] + tui.screen.popHelpLine() if button == 'reboot': From 8e88bdb5ffa09897e2fb8270c6301f173272827e Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Wed, 18 Oct 2023 16:07:52 +0200 Subject: [PATCH 2/2] Clarify Supplemental Packs dialog in presence of Driver Disks It may not be obvious to users that local-media Driver Disks must be inserted twice during installation. This change uses the memorization of usage of Driver Disks from previous commit, and uses it to explain users they likely wants to insert their Driver Disk again. Signed-off-by: Yann Dirson --- tui/installer/screens.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tui/installer/screens.py b/tui/installer/screens.py index 28247cc5..975015ea 100644 --- a/tui/installer/screens.py +++ b/tui/installer/screens.py @@ -485,10 +485,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' )