applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-29 02:15:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

branding: Add a dedicated bootloaderEntryName setting.

Browse source 
Use it in the bootloader and grubcfg modules instead of
shortProductName.
This commit is contained in:
Kevin Kofler 2014-11-19 16:50:15 +01:00
parent 91b711e0f7
commit 462819060b
5 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/bootloader/main.py
View file

@ -54,7 +54,7 @@ def get_uuid():
def create_conf(uuid, conf_path):
branding = libcalamares.globalstorage.value("branding")
distribution = branding["shortProductName"]
distribution = branding["bootloaderEntryName"]
kernel = libcalamares.job.configuration["kernel"]
img = libcalamares.job.configuration["img"]
partitions = libcalamares.globalstorage.value("partitions")
@ -81,7 +81,7 @@ def create_conf(uuid, conf_path):
def create_fallback(uuid, fallback_path):
branding = libcalamares.globalstorage.value("branding")
distribution = branding["shortProductName"]
distribution = branding["bootloaderEntryName"]
kernel = libcalamares.job.configuration["kernel"]
fb_img = libcalamares.job.configuration["fallback"]
partitions = libcalamares.globalstorage.value("partitions")
@ -108,7 +108,7 @@ def create_fallback(uuid, fallback_path):
def create_loader(loader_path):
branding = libcalamares.globalstorage.value("branding")
distribution = branding["shortProductName"]
distribution = branding["bootloaderEntryName"]
timeout = libcalamares.job.configuration["timeout"]
file_name_sanitizer = str.maketrans(" /", "_-")
lines = [
@ -127,7 +127,7 @@ def install_bootloader(boot_loader, fw_type):
install_path = libcalamares.globalstorage.value("rootMountPoint")
uuid = get_uuid()
branding = libcalamares.globalstorage.value("branding")
distribution = branding["shortProductName"]
distribution = branding["bootloaderEntryName"]
file_name_sanitizer = str.maketrans(" /", "_-")
conf_path = os.path.join(
install_path, "boot", "loader", "entries", "%s.conf" % distribution.translate(file_name_sanitizer))