[arch-commits] Commit in grub/trunk (2 files)

[Christian Hesse]

    Date: Monday, April 26, 2021 @ 09:13:18
  Author: eworm
Revision: 413873

add booster initramfs images

Modified:
  grub/trunk/0002-10_linux-detect-archlinux-initramfs.patch
  grub/trunk/PKGBUILD

------------------------------------------------+
 0002-10_linux-detect-archlinux-initramfs.patch |   39 +++++++++++++++--------
 PKGBUILD                                       |    2 -
 2 files changed, 27 insertions(+), 14 deletions(-)

Modified: 0002-10_linux-detect-archlinux-initramfs.patch
===================================================================
--- 0002-10_linux-detect-archlinux-initramfs.patch	2021-04-26 07:16:13 UTC (rev 413872)
+++ 0002-10_linux-detect-archlinux-initramfs.patch	2021-04-26 09:13:18 UTC (rev 413873)
@@ -1,25 +1,27 @@
-From 058d08a025f9a6ec77d5ddd1fc62c7bd6abe1a52 Mon Sep 17 00:00:00 2001
+From dbc289f59a2b204af19ef7212f3b6b07d3060452 Mon Sep 17 00:00:00 2001
 From: Christian Hesse <mail at eworm.de>
-Date: Wed, 10 Mar 2021 18:40:00 +0100
-Subject: [PATCH] 10_linux: detect archlinux initramfs
+Date: Mon, 26 Apr 2021 11:10:01 +0200
+Subject: [PATCH 1/1] 10_linux: detect archlinux initramfs
 ---
- util/grub.d/10_linux.in | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
+ 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..e703dcdb0 100644
+index e8b01c0d0..9b60af944 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -93,6 +93,8 @@ linux_entry ()
+@@ -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}")" ;;
-+	  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
+@@ -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`
@@ -28,7 +30,7 @@
    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
+@@ -285,6 +289,29 @@ while [ "x$list" != "x" ] ; do
  
    linux_entry "${OS}" "${version}" advanced \
                "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
@@ -44,6 +46,17 @@
 +                "${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}"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-26 07:16:13 UTC (rev 413872)
+++ PKGBUILD	2021-04-26 09:13:18 UTC (rev 413873)
@@ -73,7 +73,7 @@
             'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5'
             'SKIP'
             '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
-            'afe26438026785b582cb26b401ea78d6971eaf37bea361a5deccdf22e369dd4c'
+            '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
             '791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206')
 
 _backports=(