From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 6 Mar 2011 16:02:28 +0000 (+0100)
Subject: grub: Improve detection of used distribution for grub menu entry.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=980921fc8b9a2e776f84546a197f6039ffb3a76b;p=ipfire-3.x.git

grub: Improve detection of used distribution for grub menu entry.
---

diff --git a/pkgs/grub/grub.default b/pkgs/grub/grub.default
index f83bf3400..fe159a61f 100644
--- a/pkgs/grub/grub.default
+++ b/pkgs/grub/grub.default
@@ -5,7 +5,7 @@ GRUB_DEFAULT=0
 GRUB_HIDDEN_TIMEOUT=0
 GRUB_HIDDEN_TIMEOUT_QUIET=true
 GRUB_TIMEOUT=10
-GRUB_DISTRIBUTOR=$(sed 's/ release.*//' /etc/system-release)
+GRUB_DISTRIBUTOR=$(sed -n 's/\([A-Za-z0-9]*\) release \([0-9A-Za-z\.\-]*\) .*/\1 \2/p' < /etc/system-release)
 GRUB_CMDLINE_LINUX_DEFAULT="quiet selinux=0"
 GRUB_CMDLINE_LINUX=""
 
diff --git a/pkgs/grub/grub.nm b/pkgs/grub/grub.nm
index abed9742b..ecb359027 100644
--- a/pkgs/grub/grub.nm
+++ b/pkgs/grub/grub.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = grub
 PKG_VER        = 1.98
-PKG_REL        = 4
+PKG_REL        = 5
 
 PKG_MAINTAINER =
 PKG_GROUP      = System/Boot