From 8f5b0585cbc83c049e033d40e2386c78563a0494 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 16 Nov 2014 04:33:27 +0100 Subject: [PATCH] grubcfg: Get the distribution name from the branding. Remove the redundant "distributor" setting from grubcfg.conf (and the entire grubcfg.conf file that has no settings left for now). --- src/modules/grubcfg/grubcfg.conf | 3 --- src/modules/grubcfg/main.py | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 src/modules/grubcfg/grubcfg.conf diff --git a/src/modules/grubcfg/grubcfg.conf b/src/modules/grubcfg/grubcfg.conf deleted file mode 100644 index bdbe2dbcd..000000000 --- a/src/modules/grubcfg/grubcfg.conf +++ /dev/null @@ -1,3 +0,0 @@ ---- -# Replace 'LinuxDistribution' with your distribution name - for example with 'Manjaro' -distributor: LinuxDistribution diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 26d26a14c..c80348346 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -66,5 +66,6 @@ def modify_grub_default(partitions, root_mount_point, distributor): def run(): partitions = libcalamares.globalstorage.value("partitions") root_mount_point = libcalamares.globalstorage.value("rootMountPoint") - distributor = libcalamares.job.configuration["distributor"] + branding = libcalamares.globalstorage.value("branding") + distributor = branding["productName"] return modify_grub_default(partitions, root_mount_point, distributor)