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

bootloader: Use shortProductName.

Browse Source 
This is particularly useful if the full product name contains
"GNU/Linux" or "Linux", because e.g. "Generic GNU/Linux GNU/Linux" does
not make sense.
This commit is contained in:
Kevin Kofler 2014-11-16 05:17:06 +01:00
parent 538b457ea8
commit e420341ba6
1 changed files with 4 additions and 4 deletions
Show Stats 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["productName"]
distribution = branding["shortProductName"]
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["productName"]
distribution = branding["shortProductName"]
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["productName"]
distribution = branding["shortProductName"]
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["productName"]
distribution = branding["shortProductName"]
file_name_sanitizer = str.maketrans(" /", "_-")
conf_path = os.path.join(
install_path, "boot", "loader", "entries", "%s.conf" % distribution.translate(file_name_sanitizer))