Commit 339931e299b6bcd2136e5bfa353f44ab9ac5da0e

Authored by Silvan Calarco
1 parent 44c729c5a1
Exists in master

calamares: fix bootloader configuration

Showing 3 changed files with 21 additions and 23 deletions Side-by-side Diff

calamares/etc/calamares/modules/bootloader.conf
1 1 ---
2   -# Gummiboot configuration files settings, set kernel and initramfs file names
  2 +# Define which bootloader you want to use for EFI installations
  3 +# Possible options are 'grub' and 'systemd-boot'.
  4 +efiBootLoader: "grub"
  5 +
  6 +# systemd-boot configuration files settings, set kernel and initramfs file names
3 7 # and amount of time before default selection boots
4   -# Optionally set the menu entry name to use in Gummiboot. If not specified here,
5   -# this setting will be taken from branding.desc.
6   -# bootloaderEntryName: KaOS-kf5
7   -kernel: /vmlinuz-linux
8   -img: /initramfs-linux.img
9   -fallback: /initramfs-linux-fallback.img
  8 +kernel: "/vmlinuz"
  9 +img: "/initramfs.img"
  10 +fallback: "/initramfs-failsafe.img"
  11 +timeout: "10"
  12 +# Optionally set the menu entry name and kernel name to use in systemd-boot.
  13 +# If not specified here, these settings will be taken from branding.desc.
  14 +# bootloaderEntryName: "Generic GNU/Linux"
  15 +# kernelLine: ", with Stable-Kernel"
  16 +# fallbackKernelLine: ", with Stable-Kernel (fallback initramfs)"
10 17  
11   -timeout: 10
12   -
13 18 # GRUB 2 binary names and boot directory
14 19 # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
15 20 grubInstall: "grub-install"
16 21 grubMkconfig: "grub-mkconfig"
17 22 grubCfg: "/boot/grub/grub.cfg"
  23 +# Optionally set the --bootloader-id to use for EFI. If not set, this defaults
  24 +# to the bootloaderEntryName from branding.desc with problematic characters
  25 +# replaced. If an efiBootloaderId is specified here, it is taken to already be a
  26 +# valid directory name, so no such postprocessing is done in this case.
  27 +# efiBootloaderId: "dirname"
calamares/etc/calamares/modules/grub.conf
1   ----
2   -# GRUB 2 binary names and boot directory
3   -# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
4   -grubInstall: "grub-install"
5   -grubMkconfig: "grub-mkconfig"
6   -grubCfg: "/boot/grub/grub.cfg"
7   -# Optionally set the --bootloader-id to use for EFI. If not set, this defaults
8   -# to the bootloaderEntryName from branding.desc with problematic characters
9   -# replaced. If an efiBootloaderId is specified here, it is taken to already be a
10   -# valid directory name, so no such postprocessing is done in this case.
11   -# efiBootloaderId: "dirname"
calamares/etc/calamares/settings.conf
... ... @@ -50,10 +50,9 @@
50 50 - services
51 51 - dracut
52 52 #- initramfs
53   -- grubcfg
54   -- grub
55 53 - packages
56   -#- bootloader
  54 +- grubcfg
  55 +- bootloader
57 56 - openmamba-postinstall
58 57 - umount
59 58