Blame 0056-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
|
 |
6b2dd0f |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
f4c76c0 |
From: Peter Jones <pjones@redhat.com>
|
|
|
f4c76c0 |
Date: Thu, 4 Sep 2014 14:23:23 -0400
|
|
|
752ceb1 |
Subject: [PATCH] Generate OS and CLASS in 10_linux from /etc/os-release
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
This makes us use pretty names in the titles we generate in
|
|
|
f4c76c0 |
grub2-mkconfig when GRUB_DISTRIBUTOR isn't set.
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
Resolves: rhbz#996794
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
f4c76c0 |
---
|
|
|
f4c76c0 |
util/grub.d/10_linux.in | 3 ++-
|
|
|
f4c76c0 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
|
ad4aff0 |
index b744438e04a..43d98476b88 100644
|
|
|
f4c76c0 |
--- a/util/grub.d/10_linux.in
|
|
|
f4c76c0 |
+++ b/util/grub.d/10_linux.in
|
|
|
f4c76c0 |
@@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@"
|
|
|
f4c76c0 |
CLASS="--class gnu-linux --class gnu --class os --unrestricted"
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
|
|
f4c76c0 |
- OS="$(sed 's, release .*$,,g' /etc/system-release)"
|
|
|
f4c76c0 |
+ OS="$(eval $(grep PRETTY_NAME /etc/os-release) ; echo ${PRETTY_NAME})"
|
|
|
f4c76c0 |
+ CLASS="--class $(eval $(grep '^ID_LIKE=\|^ID=' /etc/os-release) ; [ -n "${ID_LIKE}" ] && echo ${ID_LIKE} || echo ${ID}) ${CLASS}"
|
|
|
f4c76c0 |
else
|
|
|
f4c76c0 |
OS="${GRUB_DISTRIBUTOR}"
|
|
|
f4c76c0 |
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|