Mention GNOME and KDE's soft dependency on NetworkManager in the install
This commit is contained in:
parent
3a40764194
commit
b0aa5dcbbb
|
|
@ -388,13 +388,13 @@ def ask_to_configure_network():
|
||||||
# {MAC: Ifname}
|
# {MAC: Ifname}
|
||||||
interfaces = {
|
interfaces = {
|
||||||
'ISO-CONFIG': 'Copy ISO network configuration to installation',
|
'ISO-CONFIG': 'Copy ISO network configuration to installation',
|
||||||
'NetworkManager': 'Use NetworkManager to control and manage your internet connection',
|
'NetworkManager': 'Use NetworkManager (necessary to configure internet graphically in GNOME and KDE)',
|
||||||
**list_interfaces()
|
**list_interfaces()
|
||||||
}
|
}
|
||||||
|
|
||||||
nic = generic_select(interfaces, "Select one network interface to configure (leave blank to skip): ")
|
nic = generic_select(interfaces, "Select one network interface to configure (leave blank to skip): ")
|
||||||
if nic and nic != 'Copy ISO network configuration to installation':
|
if nic and nic != 'Copy ISO network configuration to installation':
|
||||||
if nic == 'Use NetworkManager to control and manage your internet connection':
|
if nic == 'Use NetworkManager (necessary to configure internet graphically in GNOME and KDE)':
|
||||||
return {'nic': nic, 'NetworkManager': True}
|
return {'nic': nic, 'NetworkManager': True}
|
||||||
|
|
||||||
# Current workaround:
|
# Current workaround:
|
||||||
|
|
@ -700,7 +700,7 @@ def select_driver(options=AVAILABLE_GFX_DRIVERS):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
drivers = sorted(list(options))
|
drivers = sorted(list(options))
|
||||||
|
|
||||||
if drivers:
|
if drivers:
|
||||||
arguments = storage.get('arguments', {})
|
arguments = storage.get('arguments', {})
|
||||||
if has_amd_graphics():
|
if has_amd_graphics():
|
||||||
|
|
@ -711,10 +711,10 @@ def select_driver(options=AVAILABLE_GFX_DRIVERS):
|
||||||
print('For the best compatibility with your Nvidia hardware, you may want to use the Nvidia proprietary driver.')
|
print('For the best compatibility with your Nvidia hardware, you may want to use the Nvidia proprietary driver.')
|
||||||
|
|
||||||
arguments['gfx_driver'] = generic_select(drivers, input_text="Select a graphics driver or leave blank to install all open-source drivers: ")
|
arguments['gfx_driver'] = generic_select(drivers, input_text="Select a graphics driver or leave blank to install all open-source drivers: ")
|
||||||
|
|
||||||
if arguments.get('gfx_driver', None) is None:
|
if arguments.get('gfx_driver', None) is None:
|
||||||
arguments['gfx_driver'] = "All open-source (default)"
|
arguments['gfx_driver'] = "All open-source (default)"
|
||||||
|
|
||||||
return options.get(arguments.get('gfx_driver'))
|
return options.get(arguments.get('gfx_driver'))
|
||||||
|
|
||||||
raise RequirementError("Selecting drivers require a least one profile to be given as an option.")
|
raise RequirementError("Selecting drivers require a least one profile to be given as an option.")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue