63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
From dbc289f59a2b204af19ef7212f3b6b07d3060452 Mon Sep 17 00:00:00 2001
|
|
From: Christian Hesse <mail@eworm.de>
|
|
Date: Mon, 26 Apr 2021 11:10:01 +0200
|
|
Subject: [PATCH 1/1] 10_linux: detect archlinux initramfs
|
|
---
|
|
util/grub.d/10_linux.in | 29 ++++++++++++++++++++++++++++-
|
|
1 file changed, 28 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
index e8b01c0d0..9b60af944 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -91,6 +91,10 @@ linux_entry ()
|
|
fi
|
|
if [ x$type != xsimple ] ; then
|
|
case $type in
|
|
+ booster)
|
|
+ title="$(gettext_printf "%s, with Linux %s (booster initramfs)" "${os}" "${version}")" ;;
|
|
+ fallback)
|
|
+ title="$(gettext_printf "%s, with Linux %s (fallback initramfs)" "${os}" "${version}")" ;;
|
|
recovery)
|
|
title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
|
|
*)
|
|
@@ -198,7 +202,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 +289,29 @@ 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="${initrd_early} 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 test -e "${dirname}/booster-${version}.img" ; then
|
|
+ initrd="${initrd_early} booster-${version}.img"
|
|
+
|
|
+ if test -n "${initrd}" ; then
|
|
+ gettext_printf "Found booster initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
|
|
+ fi
|
|
+
|
|
+ linux_entry "${OS}" "${version}" booster \
|
|
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
+ fi
|
|
+
|
|
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
|
|
linux_entry "${OS}" "${version}" recovery \
|
|
"single ${GRUB_CMDLINE_LINUX}"
|