From 035ad6cbf9f9349abe9c740732b4215191cc9da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Thu, 19 Feb 2015 17:59:52 +0100 Subject: [PATCH] [bootloader] use bootloaderEntryName --- src/modules/bootloader/bootloader.conf | 6 +++--- src/modules/bootloader/main.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf index fd7bdec08..7a160c053 100644 --- a/src/modules/bootloader/bootloader.conf +++ b/src/modules/bootloader/bootloader.conf @@ -11,9 +11,9 @@ fallback: "/initramfs-linux-fallback.img" timeout: "10" # Optionally set the menu entry name and kenrnel namesto use in Gummiboot. # If not specified here, this setting will be taken from branding.desc. -# productName: "Generic GNU/Linux" -# kernelLine: " with Stable-Kernel" -# fallbackKernelLine: " with Stable-Kernel (fallback initramfs)" +# bootloaderEntryName: "Generic GNU/Linux" +# kernelLine: ", with Stable-Kernel" +# fallbackKernelLine: ", with Stable-Kernel (fallback initramfs)" # GRUB 2 binary names and boot directory # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 5215849de..8a6b34492 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -45,11 +45,11 @@ def get_uuid(): def get_bootloader_entry_name(): - if "productName" in libcalamares.job.configuration: - return libcalamares.job.configuration["productName"] + if "bootloaderEntryName" in libcalamares.job.configuration: + return libcalamares.job.configuration["bootloaderEntryName"] else: branding = libcalamares.globalstorage.value("branding") - return branding["productName"] + return branding["bootloaderEntryName"] def get_kernel_line(kernel_type):