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

diff --git a/pkgs/grub/grub.default b/pkgs/grub/grub.default
index f83bf340071f31486ff32564b7ac2d9a801fb11e..fe159a61f7ca64a87dae907b1ca0aeaac977a7ba 100644 (file)
--- 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 abed9742b23e9f52922d8ec894b40846617d7de5..ecb359027bc5e7639a0d06c5e1041b237d04388c 100644 (file)
--- 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