From 462819060b0f904dbc56c110602a39e41bcd0b9a Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kevin.kofler@chello.at>
Date: Wed, 19 Nov 2014 16:50:15 +0100
Subject: [PATCH] branding: Add a dedicated bootloaderEntryName setting.

Use it in the bootloader and grubcfg modules instead of
shortProductName.
---
 src/branding/default/branding.desc | 17 +++++++++--------
 src/libcalamaresui/Branding.cpp    |  3 ++-
 src/libcalamaresui/Branding.h      |  3 ++-
 src/modules/bootloader/main.py     |  8 ++++----
 src/modules/grubcfg/main.py        |  2 +-
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc
index 06ffe4747..d55e8ce6d 100644
--- a/src/branding/default/branding.desc
+++ b/src/branding/default/branding.desc
@@ -2,16 +2,17 @@
 componentName:  default
 
 strings:
-    productName:        Generic GNU/Linux
-    shortProductName:   Generic
-    version:            1.0 LTS
-    shortVersion:       1.0
-    versionedName:      Generic GNU/Linux 1.0 LTS "Rusty Trombone"
-    shortVersionedName: Generic 1.0
+    productName:         Generic GNU/Linux
+    shortProductName:    Generic
+    version:             1.0 LTS
+    shortVersion:        1.0
+    versionedName:       Generic GNU/Linux 1.0 LTS "Rusty Trombone"
+    shortVersionedName:  Generic 1.0
+    bootloaderEntryName: Generic
 
 images:
-    productLogo:        "squid.png"
-    productIcon:        "squid.png"
+    productLogo:         "squid.png"
+    productIcon:         "squid.png"
 
 slideshow:
     - "squid.png"
diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp
index 43a7714fc..f8f649d23 100644
--- a/src/libcalamaresui/Branding.cpp
+++ b/src/libcalamaresui/Branding.cpp
@@ -51,7 +51,8 @@ QStringList Branding::s_stringEntryStrings =
     "shortVersion",
     "versionedName",
     "shortVersionedName",
-    "shortProductName"
+    "shortProductName",
+    "bootloaderEntryName"
 };
 
 
diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h
index 6a4446ecd..031cdd051 100644
--- a/src/libcalamaresui/Branding.h
+++ b/src/libcalamaresui/Branding.h
@@ -43,7 +43,8 @@ public:
         ShortVersion,
         VersionedName,
         ShortVersionedName,
-        ShortProductName
+        ShortProductName,
+        BootloaderEntryName
     };
 
     enum ImageEntry : short
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index efca4a1b8..cd9dc86e4 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -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))
diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
index 3e3ad81f0..ffa165d5a 100644
--- a/src/modules/grubcfg/main.py
+++ b/src/modules/grubcfg/main.py
@@ -67,5 +67,5 @@ def run():
     partitions = libcalamares.globalstorage.value("partitions")
     root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
     branding = libcalamares.globalstorage.value("branding")
-    distributor = branding["shortProductName"]
+    distributor = branding["bootloaderEntryName"]
     return modify_grub_default(partitions, root_mount_point, distributor)