diff options
author | Maxim Fomin | 2021-06-14 13:15:19 +0100 |
---|---|---|
committer | Maxim Fomin | 2021-06-14 13:15:19 +0100 |
commit | ef4d3eb503cc3721b9d32457b2bde7ec3d1ecd89 (patch) | |
tree | 067bfcd5478988365034ff5d8af430337d29edbb /0002-10_linux-detect-archlinux-initramfs.patch | |
parent | 1798aecbe2a573e8bf465145a4f5a0f14216dd95 (diff) | |
download | aur-ef4d3eb503cc3721b9d32457b2bde7ec3d1ecd89.tar.gz |
Update to 2.06.
Diffstat (limited to '0002-10_linux-detect-archlinux-initramfs.patch')
-rw-r--r-- | 0002-10_linux-detect-archlinux-initramfs.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/0002-10_linux-detect-archlinux-initramfs.patch b/0002-10_linux-detect-archlinux-initramfs.patch new file mode 100644 index 000000000000..41ab3d12f1ef --- /dev/null +++ b/0002-10_linux-detect-archlinux-initramfs.patch @@ -0,0 +1,49 @@ +From 058d08a025f9a6ec77d5ddd1fc62c7bd6abe1a52 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Wed, 10 Mar 2021 18:40:00 +0100 +Subject: [PATCH] 10_linux: detect archlinux initramfs +--- + util/grub.d/10_linux.in | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index e8b01c0d0..e703dcdb0 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -93,6 +93,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 +@@ -198,7 +200,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}" + +@@ -285,6 +287,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}"
\ No newline at end of file |