Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve Driver Disks handling as Supplemental Packs #73

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve Driver Disks handling as Supplemental Packs #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9db0dde
Always show Supplemental Packs dialog if Driver Disks are used.
ydirson Oct 18, 2023
8e88bdb
Clarify Supplemental Packs dialog in presence of Driver Disks
ydirson Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions doc/features.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
9 changes: 8 additions & 1 deletion tui/installer/screens.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down Expand Up @@ -482,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'
)
Expand Down