From cb38bc65af525b9b15105ccc318fb8a8a3e53f3b Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Thu, 11 Aug 2011 00:57:40 +0200
Subject: Upgrade to Arch's grub2-1.99-4 patched to recognize our initrd.

---
 libre/grub2/parabola-mkconfig.patch | 74 ++++++++++++-------------------------
 1 file changed, 23 insertions(+), 51 deletions(-)

(limited to 'libre/grub2/parabola-mkconfig.patch')

diff --git a/libre/grub2/parabola-mkconfig.patch b/libre/grub2/parabola-mkconfig.patch
index d9aae8501..b2a72e118 100644
--- a/libre/grub2/parabola-mkconfig.patch
+++ b/libre/grub2/parabola-mkconfig.patch
@@ -1,51 +1,23 @@
-diff -ru grub-1.99~rc1-orig/util/grub.d/10_linux.in grub-1.99~rc1/util/grub.d/10_linux.in
---- grub-1.99~rc1-orig/util/grub.d/10_linux.in	2011-08-08 17:03:17.177418423 +0200
-+++ grub-1.99~rc1/util/grub.d/10_linux.in	2011-08-08 19:36:17.307138530 +0200
-@@ -57,12 +57,22 @@
-   version="$2"
-   recovery="$3"
-   args="$4"
--  if ${recovery} ; then
--    title="$(gettext_quoted "%s, with Linux %s (recovery mode)")"
-+  if echo "$version" | fgrep . ; then
-+    if ${recovery} ; then
-+      title="$(gettext_quoted "%s, with Linux %s (recovery mode)")"
-+    else
-+      title="$(gettext_quoted "%s, with Linux %s")"
-+    fi
-+    printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"
-   else
--    title="$(gettext_quoted "%s, with Linux %s")"
-+    # Parabola GNU/Linux-libre doesn't put kernel version in its file name.
-+    if ${recovery} ; then
-+      title="$(gettext_quoted "%s (recovery mode)")"
-+    else
-+      title="%s"
-+    fi
-+    printf "menuentry '${title}' ${CLASS} {\n" "${os}"
-   fi
--  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"
-   if ! ${recovery} ; then
-       save_default_entry | sed -e "s/^/\t/"
-   fi
-@@ -123,7 +133,7 @@
-   dirname=`dirname $linux`
-   rel_dirname=`make_system_path_relative_to_its_root $dirname`
-   version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
--  base_init=`echo $basename | sed -e "s,vmlinuz,kernel,g"`
-+  base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"`
-   alt_version="${base_init}-fallback"
-   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
- 
-diff -ru grub-1.99~rc1-orig/util/grub-mkconfig_lib.in grub-1.99~rc1/util/grub-mkconfig_lib.in
---- grub-1.99~rc1-orig/util/grub-mkconfig_lib.in	2011-08-08 17:03:17.177418423 +0200
-+++ grub-1.99~rc1/util/grub-mkconfig_lib.in	2011-08-08 17:04:48.064082390 +0200
-@@ -130,7 +130,7 @@
- 
- grub_file_is_not_garbage ()
- {
--  if test -f "$1" ; then
-+  if test -f "$1" -a ! -L "$1" ; then
-     case "$1" in
-       *.dpkg-*) return 1 ;; # debian dpkg
-       README*)  return 1 ;; # documentation
+diff -ru grub-1.99.orig/util/grub.d/10_linux.in grub-1.99/util/grub.d/10_linux.in
+--- grub-1.99.orig/util/grub.d/10_linux.in	2011-08-10 23:56:57.323380821 +0200
++++ grub-1.99/util/grub.d/10_linux.in	2011-08-11 00:12:46.840005321 +0200
+@@ -163,7 +163,8 @@
+ 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
+ 	   "initramfs-genkernel-${version}" \
+ 	   "initramfs-genkernel-${alt_version}" \
+-	   "${basename/vmlinuz/kernel}.img"; do
++	   "${basename/vmlinuz/kernel}.img" \
++	   "${basename/vmlinuz/initramfs}.img"; do
+     if test -e "${dirname}/${i}" ; then
+       initrd="$i"
+       break
+@@ -194,7 +195,8 @@
+   linux_entry "${OS}" "${version}" false \
+       "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
+   for i in "initramfs-${version}-fallback.img" \
+-	   "${basename/vmlinuz/kernel}-fallback.img"; do
++	   "${basename/vmlinuz/kernel}-fallback.img" \
++	   "${basename/vmlinuz/initramfs}-fallback.img"; do
+     if test -e "${dirname}/${i}"; then
+       initrd="$i"
+       linux_entry "${OS}" "${version}" true \
-- 
cgit v1.2.3-54-g00ecf