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

[grubcfg] refactor finding-the-grub-paths into a function

Browse Source
This commit is contained in:
Adriaan de Groot 2020-08-07 12:02:42 +02:00
parent f85c70d4d2
commit aa50dfb8a1
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/grubcfg/main.py
View File

@ -37,6 +37,19 @@ def pretty_name():
return _("Configure GRUB.") return _("Configure GRUB.")
def get_grub_config_paths(root_mount_point):
"""
Figures out where to put the grub config files. Returns
a directory path and the full path of a file inside that
directory, as "the grub-directory" and "the config file".
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")
return (default_dir, default_grub)
def modify_grub_default(partitions, root_mount_point, distributor): def modify_grub_default(partitions, root_mount_point, distributor):
""" """
Configures '/etc/default/grub' for hibernation and plymouth. Configures '/etc/default/grub' for hibernation and plymouth.
@ -54,8 +67,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
is always updated to set this value. is always updated to set this value.
:return: :return:
""" """
default_dir = os.path.join(root_mount_point, "etc/default") default_dir, default_grub = get_grub_config_paths(root_mount_point)
default_grub = os.path.join(default_dir, "grub")
distributor_replace = distributor.replace("'", "'\\''") distributor_replace = distributor.replace("'", "'\\''")
dracut_bin = libcalamares.utils.target_env_call( dracut_bin = libcalamares.utils.target_env_call(
["sh", "-c", "which dracut"] ["sh", "-c", "which dracut"]