From 92756ae912f22b77a211f92a9dd1a2b91312036b Mon Sep 17 00:00:00 2001
From: "coadde [Márcio Alexandre Silva Delgado]" <coadde@parabola.nu>
Date: Sat, 7 Dec 2013 10:13:47 -0200
Subject: grub: disable advance submenu and fixing Linux libre type

---
 libre/grub/PKGBUILD                           | 4 ++--
 libre/grub/grub.default                       | 3 +++
 libre/grub/parabola_grub_mkconfig_fixes.patch | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'libre/grub')

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index a6387904e..101aca8e9 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -48,9 +48,9 @@ source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_C
 
 md5sums=('SKIP'
          '6b8263ceccef33bd633aa019d74b7943'
-         '7a3f48a0b84c695a213667f825f3719c'
+         'f72e7b96f7b8aaf1730728724b0e32b9'
          'be55eabc102f2c60b38ed35c203686d6'
-         '52d374e0194e3f2e39ff7c92ecd58a6c'
+         'a9ef0067f6824944fa1ae22a5162d7d4'
          'SKIP'
          'SKIP'
          'SKIP')
diff --git a/libre/grub/grub.default b/libre/grub/grub.default
index 8455b67dd..38bb4a57f 100644
--- a/libre/grub/grub.default
+++ b/libre/grub/grub.default
@@ -45,3 +45,6 @@ GRUB_COLOR_HIGHLIGHT="white/magenta"
 #GRUB_INIT_TUNE="480 440 1"
 
 #GRUB_SAVEDEFAULT="true"
+
+# Disable advanced submenu, due 10_linux script file generates submenu without closing bracket with grub-mkconfig
+GRUB_DISABLE_SUBMENU="y"
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
index fcb302e1d..0b3acf485 100644
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub/parabola_grub_mkconfig_fixes.patch
@@ -90,10 +90,10 @@ index e27d6f7..2d60949 100644
 +      version="`echo "${basename}" | sed -e 's,vmlinuz-linux-libre,,g'`"
 +      
 +      if [ "x${version}" = "x" ] ; then
-+        version="libre repo kernel"
++        version="libre kernel"
 +      else
 +        version="`echo "${version}" | sed -e 's,-,,g'`"
-+        version="${version} kernel"
++        version="libre ${version} kernel"
 +      fi
 +    fi
 +  fi
-- 
cgit v1.2.3