napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #150 from kkofler/fix-issue-123

Browse Source 
grub, bootloader: Make the grub-* and /boot/grub names configurable.
This commit is contained in:
Teo Mrnjavac 2014-11-13 01:19:03 +01:00
commit df200f2210
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/bootloader/bootloader.conf
View File

@ -1,5 +1,5 @@
--- ---
# Gummiboot configuration files settings, set preffered distribution name and amount of time before # Gummiboot configuration files settings, set preferred distribution name and amount of time before
# default selection boots # default selection boots
distribution: KaOS-kf5 distribution: KaOS-kf5
kernel: /vmlinuz-linux kernel: /vmlinuz-linux
@ -8,4 +8,8 @@ fallback: /initramfs-linux-fallback.img
timeout: 10 timeout: 10
# GRUB 2 binary names and boot directory
# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
grubInstall: "grub-install"
grubMkconfig: "grub-mkconfig"
grubCfg: "/boot/grub/grub.cfg"

4
src/modules/bootloader/main.py
View File

@ -143,8 +143,8 @@ def install_bootloader(boot_loader, fw_type):
create_loader(loader_path) create_loader(loader_path)
else: else:
install_path = boot_loader["installPath"] install_path = boot_loader["installPath"]
check_chroot_call(["grub-install", install_path]) check_chroot_call([libcalamares.job.configuration["grubInstall"], install_path])
check_chroot_call(["grub-mkconfig", "-o", "/boot/grub/grub.cfg"]) check_chroot_call([libcalamares.job.configuration["grubMkconfig"], "-o", libcalamares.job.configuration["grubCfg"]])
def run(): def run():

6
src/modules/grub/grub.conf Normal file
View File

@ -0,0 +1,6 @@
---
# GRUB 2 binary names and boot directory
# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
grubInstall: "grub-install"
grubMkconfig: "grub-mkconfig"
grubCfg: "/boot/grub/grub.cfg"

4
src/modules/grub/main.py
View File

@ -23,8 +23,8 @@ from libcalamares.utils import check_chroot_call
def install_grub(boot_loader): def install_grub(boot_loader):
install_path = boot_loader["installPath"] install_path = boot_loader["installPath"]
check_chroot_call(["grub-install", install_path]) check_chroot_call([libcalamares.job.configuration["grubInstall"], install_path])
check_chroot_call(["grub-mkconfig", "-o", "/boot/grub/grub.cfg"]) check_chroot_call([libcalamares.job.configuration["grubMkconfig"], "-o", libcalamares.job.configuration["grubCfg"]])
def run(): def run():