From e0f40cb4a4b7691ebb54092adb2ccced6c2f59a7 Mon Sep 17 00:00:00 2001 From: dalto Date: Sun, 21 Feb 2021 17:36:11 -0600 Subject: [PATCH] Remove EOS-specific changes --- src/modules/bootloader/bootloader.conf | 2 +- src/modules/bootloader/main.py | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf index a8a82c368..278c345ad 100644 --- a/src/modules/bootloader/bootloader.conf +++ b/src/modules/bootloader/bootloader.conf @@ -7,7 +7,7 @@ --- # Define which bootloader you want to use for EFI installations # Possible options are 'grub', 'sb-shim' and 'systemd-boot'. -efiBootLoader: "systemd-boot" +efiBootLoader: "grub" # systemd-boot configuration files settings, set kernel search path, kernel name # and amount of time before default selection boots diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index e42f33b3e..ba61cc665 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -322,20 +322,6 @@ def install_systemd_boot(efi_directory): create_loader(loader_path, distribution_translated) - # clean up redundant kernel and initrd - try: - os.remove(os.path.join(install_path, "boot/vmlinuz-linux")) - except FileNotFoundError: - pass - try: - os.remove(os.path.join(install_path, "boot/initramfs-linux.img")) - except FileNotFoundError: - pass - try: - os.remove(os.path.join(install_path, "boot/initramfs-linux-fallback.img")) - except FileNotFoundError: - pass - def get_grub_efi_parameters(): """