[grub2/f17] use /etc/system-release for naming of Linux entries instead of GNU/Linux

Peter Jones pjones at fedoraproject.org
Thu Apr 26 14:31:16 UTC 2012


commit 5429640b2b18165d26fbdd060adb3116304c531a
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Thu Apr 5 02:14:31 2012 +0200

    use /etc/system-release for naming of Linux entries instead of GNU/Linux

 grub-1.99-just-say-linux.patch |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/grub-1.99-just-say-linux.patch b/grub-1.99-just-say-linux.patch
index 389b163..98ab2b7 100644
--- a/grub-1.99-just-say-linux.patch
+++ b/grub-1.99-just-say-linux.patch
@@ -3,7 +3,6 @@ From: Peter Jones <pjones at redhat.com>
 Date: Mon, 14 Mar 2011 14:27:42 -0400
 Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
 
-In Fedora and RHEL we just call it Linux.
 ---
  util/grub.d/10_linux.in     |    4 ++--
  util/grub.d/20_linux_xen.in |    4 ++--
@@ -18,7 +17,7 @@ index a09c3e6..0b0df78 100644
  
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
 -  OS=GNU/Linux
-+  OS=Linux
++  OS="$(sed 's, release .*$,,g' /etc/system-release) Linux"
  else
 -  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
 +  OS="${GRUB_DISTRIBUTOR} Linux"
@@ -34,7 +33,7 @@ index ee49cd9..10422b0 100644
  
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
 -  OS=GNU/Linux
-+  OS=Linux
++  OS="$(sed 's, release .*$,,g' /etc/system-release) Linux"
  else
 -  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
 +  OS="${GRUB_DISTRIBUTOR} Linux"


More information about the scm-commits mailing list