summaryrefslogtreecommitdiff
path: root/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch')
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch62
1 files changed, 37 insertions, 25 deletions
diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch
index 8184871b5..3ae7d9546 100644
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch
@@ -1,21 +1,23 @@
-diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
---- a/util/grub.d/10_linux.in 2015-09-27 14:14:45.544730230 -0300
-+++ b/util/grub.d/10_linux.in 2015-09-27 15:34:19.822404966 -0300
-@@ -80,9 +80,11 @@
+--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500
++++ b/util/grub.d/10_linux.in 2021-06-17 13:39:03.509682976 -0500
+@@ -91,10 +91,14 @@
+ fi
if [ x$type != xsimple ] ; then
case $type in
++ booster)
++ title="$(gettext_printf "%s, %s kernel (booster initramfs)" "${os}" "${version}")" ;;
++ fallback)
++ title="$(gettext_printf "%s, %s kernel (fallback initramfs)" "${os}" "${version}")" ;;
recovery)
- title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
+ title="$(gettext_printf "%s, %s kernel (recovery mode)" "${os}" "${version}")" ;;
-+ fallback)
-+ title="$(gettext_printf "%s, %s kernel (fallback initramfs)" "${os}" "${version}")" ;;
*)
- title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
+ title="$(gettext_printf "%s, %s kernel" "${os}" "${version}")" ;;
esac
if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
-@@ -94,7 +96,7 @@
+@@ -106,7 +110,7 @@
else
echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
fi
@@ -24,7 +26,7 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
save_default_entry | grub_add_tab
fi
-@@ -126,7 +128,7 @@
+@@ -138,7 +142,7 @@
fi
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
fi
@@ -33,7 +35,7 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)'
linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -182,7 +184,7 @@
+@@ -198,7 +202,7 @@
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
@@ -42,29 +44,39 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
alt_version=`echo $version | sed -e "s,\.old$,,g"`
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-@@ -238,6 +240,18 @@
+@@ -285,6 +289,29 @@
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"
-+
++ initrd="${initrd_early} initramfs-${version}-fallback.img"
++
+ if test -n "${initrd}" ; then
+ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${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}"
-diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
---- a/util/grub.d/20_linux_xen.in 2015-09-27 14:14:45.544730230 -0300
-+++ b/util/grub.d/20_linux_xen.in 2015-09-27 15:35:00.589739244 -0300
-@@ -88,9 +88,11 @@
+--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500
++++ b/util/grub.d/20_linux_xen.in 2021-06-17 03:22:43.732079272 -0500
+@@ -117,9 +117,11 @@
fi
if [ x$type != xsimple ] ; then
if [ x$type = xrecovery ] ; then
@@ -78,7 +90,7 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
fi
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
-@@ -103,7 +105,7 @@
+@@ -132,7 +134,7 @@
title="$(gettext_printf "%s, with Xen hypervisor" "${os}")"
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
fi
@@ -87,7 +99,7 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/"
fi
-@@ -112,7 +114,7 @@
+@@ -141,7 +143,7 @@
fi
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
@@ -96,7 +108,7 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$xmessage" | grub_quote)'
if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then
-@@ -210,7 +212,7 @@
+@@ -275,7 +277,7 @@
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
@@ -105,18 +117,18 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
alt_version=`echo $version | sed -e "s,\.old$,,g"`
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-@@ -252,6 +254,18 @@
+@@ -341,6 +343,18 @@
linux_entry "${OS}" "${version}" "${xen_version}" advanced \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
+
+ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then
+ initrd="initramfs-${version}-fallback.img"
-+
++
+ if test -n "${initrd}" ; then
+ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2
+ fi
-+
++
+ linux_entry "${OS}" "${version}" "${xen_version}" fallback \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
+ fi
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 14:29:43 +0000