Update patches and remove unnecessary workaround.

1 files changed, 0 insertions, 41 deletions

diff --git a/10_linux-detect-archlinux-initramfs.patch b/10_linux-detect-archlinux-initramfs.patch
deleted file mode 100644
index 512fa0451504..000000000000
--- a/10_linux-detect-archlinux-initramfs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index f5d3e78..ef59c8c 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -83,6 +83,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
-@@ -186,7 +188,7 @@ while [ "x$list" != "x" ] ; do
-   basename=`basename $linux`
-   dirname=`dirname $linux`
-   rel_dirname=`make_system_path_relative_to_its_root $dirname`
--  version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
-+  version=`echo $basename | sed -e "s,vmlinuz-,,g"`
-   alt_version=`echo $version | sed -e "s,\.old$,,g"`
-   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
- 
-@@ -248,6 +250,18 @@ while [ "x$list" != "x" ] ; do
- 
-   linux_entry "${OS}" "${version}" advanced \
-               "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+
-+  if test -e "${dirname}/initramfs-${version}-fallback.img" ; then
-+    initrd="initramfs-${version}-fallback.img"
-+
-+    if test -n "${initrd}" ; then
-+      gettext_printf "Found fallback initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
-+    fi
-+
-+    linux_entry "${OS}" "${version}" fallback \
-+                "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+  fi
-+
-   if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
-     linux_entry "${OS}" "${version}" recovery \
-                 "single ${GRUB_CMDLINE_LINUX}"