Fri Mar 21 03:19:28 UTC 2014

10 files changed, 0 insertions, 481 deletions

diff --git a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch b/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
deleted file mode 100644
index e043633af..000000000
--- a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d09689a5a2863043d007c1acb9bf0a8d1d3b776d Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@ubuntu.com>
-Date: Fri, 28 Dec 2012 06:43:35 +0000
-Subject: [PATCH 069/364] Backport gnulib fixes for C11.  Fixes Savannah bug
- #37738.
-
-* grub-core/gnulib/stdio.in.h (gets): Warn on use only if
-HAVE_RAW_DECL_GETS.
-* m4/stdio_h.m4 (gl_STDIO_H): Check for gets.
----
- ChangeLog                   | 8 ++++++++
- grub-core/gnulib/stdio.in.h | 6 ++++--
- m4/stdio_h.m4               | 2 +-
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h
-index 80b9dbf..a8b00c6 100644
---- a/grub-core/gnulib/stdio.in.h
-+++ b/grub-core/gnulib/stdio.in.h
-@@ -138,10 +138,12 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
- #endif
- 
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
- #undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
-index f5650cd..8458bec 100644
---- a/m4/stdio_h.m4
-+++ b/m4/stdio_h.m4
-@@ -37,7 +37,7 @@ AC_DEFUN([gl_STDIO_H],
-   dnl corresponding gnulib module is not in use, and which is not
-   dnl guaranteed by C89.
-   gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
--    ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat
-+    ]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat
-     snprintf tmpfile vdprintf vsnprintf])
- ])
- 
--- 
-1.8.1.4
-
diff --git a/libre/grub/10_linux.in.patch b/libre/grub/10_linux.in.patch
deleted file mode 100644
index c9285e699..000000000
--- a/libre/grub/10_linux.in.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nur grub.orig/util/grub.d/10_linux.in grub/util/grub.d/10_linux.in
---- grub.orig/util/grub.d/10_linux.in	2014-01-11 06:07:40.750886565 -0200
-+++ grub/util/grub.d/10_linux.in	2014-01-11 06:14:19.032955542 -0200
-@@ -30,8 +30,25 @@
- 
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-   OS=GNU/Linux
--else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "Blag" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "blag" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "Musix" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "musix" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; 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|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
- fi
- 
diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+
deleted file mode 100644
index 086f0cc84..000000000
--- a/libre/grub/60_memtest86+
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-########################################################
-# This script generates a memtest86+ entry on grub.cfg #
-# if memtest is installed on the system.               #
-########################################################
-
-prefix="/usr"
-exec_prefix="${prefix}"
-
-datarootdir="/usr/share"
-datadir="${datarootdir}"
-
-. "${datadir}/grub/grub-mkconfig_lib"
-
-MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
-CLASS="--class memtest86 --class gnu --class tool"
-
-if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then
-    ## image exists, create menu entry
-    echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2
-    _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})"
-    _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
-    _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
-    cat << EOF
-if [ "\${grub_platform}" == "pc" ]; then
-    menuentry "Memory Tester (memtest86+)" ${CLASS} {
-        search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
-        linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
-    }
-fi
-EOF
-fi
diff --git a/libre/grub/grub-2.00-fix-docs.patch b/libre/grub/grub-2.00-fix-docs.patch
deleted file mode 100644
index 0aa481154..000000000
--- a/libre/grub/grub-2.00-fix-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 40d6b00fa48ae9c1cecf143da5c6061f6ffcb719 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com
-Date: Tue, 12 Mar 2013 15:23:02 -0400
-Subject: [PATCH] Fix docs
-
-I think the doc generation tools got stricter, so fix up the .texi file
-to work.
-
-diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
---- a/docs/grub-dev.texi
-+++ b/docs/grub-dev.texi
-@@ -1394,8 +1394,8 @@ grub_video_blit_glyph (&glyph, color, 0,
- 
- @node Bitmap API
- @section Bitmap API
--@itemize
- @subsection grub_video_bitmap_create
-+@itemize
- @item Prototype:
- @example
- grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format)
diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub/grub-2.00-mkinitcpio-0.15.patch
deleted file mode 100644
index 1af848fa3..000000000
--- a/libre/grub/grub-2.00-mkinitcpio-0.15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/grub.d/10_linux.in.old	2013-07-28 08:55:47.825946239 +0200
-+++ util/grub.d/10_linux.in	2013-07-28 08:56:14.082201512 +0200
-@@ -138,7 +138,7 @@
-   message="$(gettext_printf "Loading Linux %s ..." "${version}")"
-   sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$(echo "$message" | grub_quote)'
--	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-+	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args}
- EOF
-   if test -n "${initrd}" ; then
-     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
diff --git a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch b/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch
deleted file mode 100644
index 9a2eb3ff7..000000000
--- a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-There is no explicit option to turn off alignment; it is implicitly
-disabled if one of --separator or --nameprefixes option is used.
-
---separator was added in 2007, --nameprefixes - in 2009. So let's use
---separator to extend range of versions we are compatible with. Note that
-one or another must be used, current parsing is broken otherwise.
-
-Signed-off-by: Andrey Borzenkov <address@hidden>
-
----
- util/getroot.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/util/getroot.c b/util/getroot.c
-index 2ad8a55..3afcf96 100644
---- a/util/getroot.c
-+++ b/util/getroot.c
-@@ -1322,7 +1322,7 @@ grub_util_get_dev_abstraction (const char *os_dev)
- static void
- pull_lvm_by_command (const char *os_dev)
- {
--  char *argv[6];
-+  char *argv[8];
-   int fd;
-   pid_t pid;
-   FILE *mdadm;
-@@ -1351,12 +1351,17 @@ pull_lvm_by_command (const char *os_dev)
- 
-   /* execvp has inconvenient types, hence the casts.  None of these
-      strings will actually be modified.  */
-+  /* by default PV name is left aligned in 10 character field, meaning that
-+     we do not know where name ends. Using dummy --separator disables
-+     alignment. We have a single field, so separator itself is not output */
-   argv[0] = (char *) "vgs";
-   argv[1] = (char *) "--options";
-   argv[2] = (char *) "pv_name";
-   argv[3] = (char *) "--noheadings";
--  argv[4] = vgname;
--  argv[5] = NULL;
-+  argv[4] = (char *) "--separator";
-+  argv[5] = (char *) ":";
-+  argv[6] = vgname;
-+  argv[7] = NULL;
- 
-   pid = exec_pipe (argv, &fd);
-   free (vgname);
-@@ -1376,6 +1381,7 @@ pull_lvm_by_command (const char *os_dev)
-   while (getline (&buf, &len, mdadm) > 0)
-     {
-       char *ptr;
-+      /* LVM adds two spaces as standard prefix */
-       for (ptr = buf; ptr < buf + 2 && *ptr == ' '; ptr++);
-       if (*ptr == '\0')
-        continue;
diff --git a/libre/grub/grub-add-GRUB_COLOR_variables.patch b/libre/grub/grub-add-GRUB_COLOR_variables.patch
deleted file mode 100644
index c113a81d5..000000000
--- a/libre/grub/grub-add-GRUB_COLOR_variables.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 3390ba9..c416489 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -218,6 +218,8 @@ export GRUB_DEFAULT \
-   GRUB_THEME \
-   GRUB_GFXPAYLOAD_LINUX \
-   GRUB_DISABLE_OS_PROBER \
-+  GRUB_COLOR_NORMAL \
-+  GRUB_COLOR_HIGHLIGHT \
-   GRUB_INIT_TUNE \
-   GRUB_SAVEDEFAULT \
-   GRUB_ENABLE_CRYPTODISK \
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index d2e7252..8259f45 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -125,6 +125,14 @@ cat <<EOF
- 
- EOF
- 
-+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
-+    cat << EOF
-+set menu_color_normal=$GRUB_COLOR_NORMAL
-+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
-+
-+EOF
-+fi
-+
- serial=0;
- gfxterm=0;
- for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
diff --git a/libre/grub/grub.default b/libre/grub/grub.default
deleted file mode 100644
index 8455b67dd..000000000
--- a/libre/grub/grub.default
+++ /dev/null
@@ -1,47 +0,0 @@
-GRUB_DEFAULT=0
-GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR="Parabola"
-GRUB_CMDLINE_LINUX_DEFAULT="quiet"
-GRUB_CMDLINE_LINUX=""
-
-# Preload both GPT and MBR modules so that they are not missed
-GRUB_PRELOAD_MODULES="part_gpt part_msdos"
-
-# Uncomment to enable Hidden Menu, and optionally hide the timeout count
-#GRUB_HIDDEN_TIMEOUT=5
-#GRUB_HIDDEN_TIMEOUT_QUIET=true
-
-# Uncomment to use basic console
-GRUB_TERMINAL_INPUT=console
-
-# Uncomment to disable graphical terminal
-#GRUB_TERMINAL_OUTPUT=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-GRUB_GFXMODE=auto
-
-# Uncomment to allow the kernel use the same resolution used by grub
-GRUB_GFXPAYLOAD_LINUX=keep
-
-# Uncomment if you want GRUB to pass to the Linux kernel the old parameter 
-# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" 
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-GRUB_DISABLE_RECOVERY=true
-
-# Uncomment and set to the desired menu colors.  Used by normal and wallpaper 
-# modes only.  Entries specified as foreground/background.
-GRUB_COLOR_NORMAL="magenta/black"
-GRUB_COLOR_HIGHLIGHT="white/magenta"
-
-# Uncomment one of them for the gfx desired, a image background or a gfxtheme
-#GRUB_BACKGROUND="/path/to/wallpaper"
-#GRUB_THEME="/path/to/gfxtheme"
-
-# Uncomment to get a beep at GRUB start
-#GRUB_INIT_TUNE="480 440 1"
-
-#GRUB_SAVEDEFAULT="true"
diff --git a/libre/grub/grub.install b/libre/grub/grub.install
deleted file mode 100644
index 9188b357a..000000000
--- a/libre/grub/grub.install
+++ /dev/null
@@ -1,33 +0,0 @@
-infodir="usr/share/info"
-filelist=('grub.info' 'grub-dev.info')
-
-post_install() {
-  if [ -f /boot/grub/grub.cfg.pacsave ]; then
-    echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
-    install -D -m0644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
-  fi
-
-  cat << 'EOM'
-Generating grub.cfg.example config file...
-This may fail on some machines running a custom kernel.
-EOM
-  
-  grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
-  echo "done."
-
-  for file in ${filelist[@]}; do
-    install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  for file in ${filelist[@]}; do
-    install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete ${infodir}/${file} ${infodir}/dir 2> /dev/null
-  done
-}
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
deleted file mode 100644
index 6e3a524f0..000000000
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 016ee82..2cdbdd8 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -214,6 +214,8 @@ export GRUB_DEFAULT \
-   GRUB_THEME \
-   GRUB_GFXPAYLOAD_LINUX \
-   GRUB_DISABLE_OS_PROBER \
-+  GRUB_COLOR_NORMAL \
-+  GRUB_COLOR_HIGHLIGHT \
-   GRUB_INIT_TUNE \
-   GRUB_SAVEDEFAULT \
-   GRUB_ENABLE_CRYPTODISK \
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index d2e7252..8259f45 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -125,6 +125,14 @@ cat <<EOF
- 
- EOF
- 
-+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
-+    cat << EOF
-+set menu_color_normal=$GRUB_COLOR_NORMAL
-+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
-+
-+EOF
-+fi
-+
- serial=0;
- 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 e27d6f7..a946e71 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -31,7 +31,25 @@ CLASS="--class gnu-linux --class gnu --class os"
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-   OS=GNU/Linux
- else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "Blag" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "blag" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "Musix" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "musix" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; 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|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
- fi
- 
-@@ -87,6 +105,8 @@ linux_entry ()
-       case $type in
- 	  recovery)
- 	      title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
-+	  fallback)
-+	      title="$(gettext_printf "%s, with Linux %s (Fallback initramfs)" "${os}" "${version}")" ;;
- 	  *)
- 	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
-       esac
-@@ -100,7 +120,7 @@ linux_entry ()
-   else
-       echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
-   fi      
--  if [ x$type != xrecovery ] ; then
-+  if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then
-       save_default_entry | grub_add_tab
-   fi
- 
-@@ -132,7 +152,8 @@ linux_entry ()
-     fi
-     printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
-   fi
--  message="$(gettext_printf "Loading Linux %s ..." ${version})"
-+
-+  message="$(gettext_printf "Loading Linux %s ..." "${version}")"
-   sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$(echo "$message" | grub_quote)'
- 	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -190,7 +211,22 @@ while [ "x$list" != "x" ] ; do
-   alt_version=`echo $version | sed -e "s,\.old$,,g"`
-   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
- 
-+  if test -e "/etc/parabola-release" ; then
-+    if echo "${basename}" | grep -q 'vmlinuz-linux-libre' ; then
-+      version="`echo "${basename}" | sed -e 's,vmlinuz-linux-libre,,g'`"
-+      
-+      if [ "x${version}" = "x" ] ; then
-+        version="libre kernel"
-+      else
-+        version="`echo "${version}" | sed -e 's,-,,g'`"
-+        version="libre ${version} kernel"
-+      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 +234,8 @@ while [ "x$list" != "x" ] ; do
- 	   "initramfs-genkernel-${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
-@@ -226,6 +263,22 @@ while [ "x$list" != "x" ] ; do
-     linux_root_device_thisversion=${GRUB_DEVICE}
-   fi
- 
-+  if test -e "/etc/parabola-release" ; then
-+    is_first_entry="false"
-+    
-+    linux_entry "${OS}" "${version}" true \
-+              "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+    
-+    for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do
-+      if test -e "${dirname}/${i}" ; then
-+        initrd="${i}"
-+        linux_entry "${OS}" "${version}" fallback \
-+                    "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+        break
-+      fi
-+    done
-+  fi
-+
-   if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
-     linux_entry "${OS}" "${version}" simple \
-     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-@@ -240,8 +293,11 @@ while [ "x$list" != "x" ] ; do
-     is_top_level=false
-   fi
- 
-+  if ! test -e "/etc/parabola-release" ; then
-   linux_entry "${OS}" "${version}" advanced \
-               "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+  fi
-+
-   if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
-     linux_entry "${OS}" "${version}" recovery \
-                 "single ${GRUB_CMDLINE_LINUX}"
-@@ -252,8 +308,10 @@ done
- 
- # If at least one kernel was found, then we need to
- # add a closing '}' for the submenu command.
-+if ! test -e "/etc/parabola-release" ; then
- if [ x"$is_top_level" != xtrue ]; then
-   echo '}'
- fi
-+fi
- 
- echo "$title_correction_code"