From 9b8ae113c3008d9849c9c711a595e3b8037439f1 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Mon, 11 Feb 2013 13:33:37 -0200
Subject: grub-2.00-1.2: updating revision"

* Remove obsolete files
* Fixing OS parameter on 10_linux.in for others distros
---
 libre/grub/parabola_grub_mkconfig_fixes.patch | 30 +++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

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

diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
index 19022aec6..e34770058 100644
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub/parabola_grub_mkconfig_fixes.patch
@@ -31,19 +31,23 @@ 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 14402e8..64c9bb5 100644
+index 14402e8..daa353d 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,11 @@ CLASS="--class gnu-linux --class gnu --class os"
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
    OS=GNU/Linux
  else
 -  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  OS="${GRUB_DISTRIBUTOR}"
++  if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then
++      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
++  else
++      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++  fi
    CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
  fi
-  
-@@ -87,6 +87,8 @@ linux_entry ()
+ 
+@@ -87,6 +91,8 @@ linux_entry ()
        case $type in
  	  recovery)
  	      title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
@@ -52,7 +56,7 @@ index 14402e8..64c9bb5 100644
  	  *)
  	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
        esac
-@@ -100,7 +102,7 @@ linux_entry ()
+@@ -100,7 +106,7 @@ linux_entry ()
    else
        echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
    fi      
@@ -61,7 +65,7 @@ index 14402e8..64c9bb5 100644
        save_default_entry | sed -e "s/^/\t/"
    fi
  
-@@ -132,7 +134,8 @@ linux_entry ()
+@@ -132,7 +138,8 @@ linux_entry ()
      fi
      printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
    fi
@@ -71,7 +75,7 @@ index 14402e8..64c9bb5 100644
    sed "s/^/$submenu_indentation/" << EOF
  	echo	'$message'
  	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -190,7 +193,22 @@ while [ "x$list" != "x" ] ; do
+@@ -190,7 +197,22 @@ while [ "x$list" != "x" ] ; do
    alt_version=`echo $version | sed -e "s,\.old$,,g"`
    linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
  
@@ -87,14 +91,14 @@ index 14402e8..64c9bb5 100644
 +      fi
 +    fi
 +  fi
-+  
++
    initrd=
 +  initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`"
 +
    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" \
-@@ -198,7 +216,8 @@ while [ "x$list" != "x" ] ; do
+@@ -198,7 +220,8 @@ while [ "x$list" != "x" ] ; do
  	   "initramfs-genkernel-${version}" \
  	   "initramfs-genkernel-${alt_version}" \
  	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
@@ -104,7 +108,7 @@ index 14402e8..64c9bb5 100644
      if test -e "${dirname}/${i}" ; then
        initrd="$i"
        break
-@@ -226,6 +245,22 @@ while [ "x$list" != "x" ] ; do
+@@ -226,6 +249,22 @@ while [ "x$list" != "x" ] ; do
      linux_root_device_thisversion=${GRUB_DEVICE}
    fi
  
@@ -127,7 +131,7 @@ index 14402e8..64c9bb5 100644
    if [ "x$is_first_entry" = xtrue ]; then
      linux_entry "${OS}" "${version}" simple \
      "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-@@ -239,8 +274,11 @@ while [ "x$list" != "x" ] ; do
+@@ -239,8 +278,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
  
@@ -139,7 +143,7 @@ index 14402e8..64c9bb5 100644
    if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
      linux_entry "${OS}" "${version}" recovery \
                  "single ${GRUB_CMDLINE_LINUX}"
-@@ -252,8 +290,10 @@ done
+@@ -252,8 +294,10 @@ done
  
  # If at least one kernel was found, then we need to
  # add a closing '}' for the submenu command.
-- 
cgit v1.2.3