Set default bootloader based on presence of UEFI (#980)
* Set default bootloader based on presence of UEFI * Correct a comment
This commit is contained in:
parent
2c897cdcc6
commit
8457aa5660
|
|
@ -6,6 +6,7 @@ from typing import Callable, Any, List, Iterator
|
||||||
|
|
||||||
from .menu import Menu
|
from .menu import Menu
|
||||||
from ..general import SysCommand, secret
|
from ..general import SysCommand, secret
|
||||||
|
from ..hardware import has_uefi
|
||||||
from ..storage import storage
|
from ..storage import storage
|
||||||
from ..output import log
|
from ..output import log
|
||||||
from ..profiles import is_desktop_profile
|
from ..profiles import is_desktop_profile
|
||||||
|
|
@ -454,7 +455,8 @@ class GlobalMenu(GeneralMenu):
|
||||||
self._menu_options['bootloader'] = \
|
self._menu_options['bootloader'] = \
|
||||||
Selector(
|
Selector(
|
||||||
_('Select bootloader'),
|
_('Select bootloader'),
|
||||||
lambda: ask_for_bootloader(storage['arguments'].get('advanced', False)),)
|
lambda: ask_for_bootloader(storage['arguments'].get('advanced', False)),
|
||||||
|
default="systemd-bootctl" if has_uefi() else "grub-install")
|
||||||
self._menu_options['hostname'] = \
|
self._menu_options['hostname'] = \
|
||||||
Selector(_('Specify hostname'), lambda: ask_hostname())
|
Selector(_('Specify hostname'), lambda: ask_hostname())
|
||||||
self._menu_options['!root-password'] = \
|
self._menu_options['!root-password'] = \
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ def ask_user_questions():
|
||||||
# Get disk encryption password (or skip if blank)
|
# Get disk encryption password (or skip if blank)
|
||||||
global_menu.enable('!encryption-password')
|
global_menu.enable('!encryption-password')
|
||||||
|
|
||||||
# Ask which boot-loader to use (will only ask if we're in BIOS (non-efi) mode)
|
# Ask which boot-loader to use (will only ask if we're in UEFI mode, otherwise will default to GRUB)
|
||||||
global_menu.enable('bootloader')
|
global_menu.enable('bootloader')
|
||||||
|
|
||||||
global_menu.enable('swap')
|
global_menu.enable('swap')
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue