From 8bf95b68812ada29ba82bddf67a0f243ae97cd42 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 7 Aug 2020 12:13:51 +0200 Subject: [PATCH] [grubcfg] Support prefer_grub_d settings --- src/modules/grubcfg/main.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 3c3f3d447..04b5eba9e 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -46,12 +46,19 @@ def get_grub_config_path(root_mount_point): Returns a path into @p root_mount_point. """ default_dir = os.path.join(root_mount_point, "etc/default") - default_grub = os.path.join(default_dir, "grub") + default_config_file = "grub" + + if "prefer_grub_d" in libcalamares.job.configuration and libcalamares.job.configuration["prefer_grub_d"]: + possible_dir = os.path.join(root_mount_point, "etc/default/grub.d") + if os.path.exists(possible_dir) and os.path.isdir(possible_dir): + default_dir = possible_dir + default_config_file = "00calamares" if not os.path.exists(default_dir): os.mkdir(default_dir) - return default_grub + return os.path.join(default_dir, default_config_file) + def modify_grub_default(partitions, root_mount_point, distributor): """