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

[bootloader] use bootloaderEntryName

Browse Source
This commit is contained in:
Philip Müller 2015-02-19 17:59:52 +01:00
parent cf1e5a8b51
commit 035ad6cbf9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/bootloader/bootloader.conf
View File

@ -11,9 +11,9 @@ fallback: "/initramfs-linux-fallback.img"
timeout: "10" timeout: "10"
# Optionally set the menu entry name and kenrnel namesto use in Gummiboot. # Optionally set the menu entry name and kenrnel namesto use in Gummiboot.
# If not specified here, this setting will be taken from branding.desc. # If not specified here, this setting will be taken from branding.desc.
# productName: "Generic GNU/Linux" # bootloaderEntryName: "Generic GNU/Linux"
# kernelLine: " with Stable-Kernel" # kernelLine: ", with Stable-Kernel"
# fallbackKernelLine: " with Stable-Kernel (fallback initramfs)" # fallbackKernelLine: ", with Stable-Kernel (fallback initramfs)"
# GRUB 2 binary names and boot directory # GRUB 2 binary names and boot directory
# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.

6
src/modules/bootloader/main.py
View File

@ -45,11 +45,11 @@ def get_uuid():
def get_bootloader_entry_name(): def get_bootloader_entry_name():
if "productName" in libcalamares.job.configuration: if "bootloaderEntryName" in libcalamares.job.configuration:
return libcalamares.job.configuration["productName"] return libcalamares.job.configuration["bootloaderEntryName"]
else: else:
branding = libcalamares.globalstorage.value("branding") branding = libcalamares.globalstorage.value("branding")
return branding["productName"] return branding["bootloaderEntryName"]
def get_kernel_line(kernel_type): def get_kernel_line(kernel_type):