From 2acd7ff9032c07a38251b55c164cc10b246c8268 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <andre@pc-01.localdomain>
Date: Sun, 22 Apr 2012 20:58:37 -0300
Subject: grub2-2.00beta4-1: updating version

---
 libre/grub2/parabola_grub_mkconfig_fixes.patch | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'libre/grub2/parabola_grub_mkconfig_fixes.patch')

diff --git a/libre/grub2/parabola_grub_mkconfig_fixes.patch b/libre/grub2/parabola_grub_mkconfig_fixes.patch
index d199dc86a..19022aec6 100644
--- a/libre/grub2/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub2/parabola_grub_mkconfig_fixes.patch
@@ -1,5 +1,5 @@
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index df3b733..65a7fff 100644
+index 516be86..5f37db2 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -213,6 +213,8 @@ export GRUB_DEFAULT \
@@ -31,7 +31,7 @@ index 765bfdc..b148558 100644
  gfxterm=0;
  for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 8c75fab..0d4a137 100644
+index 14402e8..64c9bb5 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -31,7 +31,7 @@
@@ -71,7 +71,7 @@ index 8c75fab..0d4a137 100644
    sed "s/^/$submenu_indentation/" << EOF
  	echo	'$message'
  	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -181,13 +184,29 @@ while [ "x$list" != "x" ] ; do
+@@ -190,7 +193,22 @@ while [ "x$list" != "x" ] ; do
    alt_version=`echo $version | sed -e "s,\.old$,,g"`
    linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
  
@@ -94,15 +94,17 @@ index 8c75fab..0d4a137 100644
    for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
  	   "initrd-${version}" "initramfs-${version}.img" \
  	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
- 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
+@@ -198,7 +216,8 @@ while [ "x$list" != "x" ] ; do
  	   "initramfs-genkernel-${version}" \
--	   "initramfs-genkernel-${alt_version}"; do
-+	   "initramfs-genkernel-${alt_version}" \
+ 	   "initramfs-genkernel-${alt_version}" \
+ 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
++	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \
 +	   "${initrd_arch}.img" ; do
      if test -e "${dirname}/${i}" ; then
        initrd="$i"
        break
-@@ -215,6 +234,22 @@ while [ "x$list" != "x" ] ; do
+@@ -226,6 +245,22 @@ while [ "x$list" != "x" ] ; do
      linux_root_device_thisversion=${GRUB_DEVICE}
    fi
  
@@ -125,7 +127,7 @@ index 8c75fab..0d4a137 100644
    if [ "x$is_first_entry" = xtrue ]; then
      linux_entry "${OS}" "${version}" simple \
      "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-@@ -228,8 +263,11 @@ while [ "x$list" != "x" ] ; do
+@@ -239,8 +274,11 @@ while [ "x$list" != "x" ] ; do
      echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
    fi
  
@@ -137,7 +139,7 @@ index 8c75fab..0d4a137 100644
    if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
      linux_entry "${OS}" "${version}" recovery \
                  "single ${GRUB_CMDLINE_LINUX}"
-@@ -241,8 +279,10 @@ done
+@@ -252,8 +290,10 @@ done
  
  # If at least one kernel was found, then we need to
  # add a closing '}' for the submenu command.
-- 
cgit v1.2.3-54-g00ecf