From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 15 Jun 2023 21:24:17 +0000 (+0200)
Subject: committing changes in /etc made by "/usr/bin/apt full-upgrade -y"
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=27dd9d8039635e289282a21d556e9d51dece4a55;p=config%2Fbruni%2Fetc-mint-new1.git

committing changes in /etc made by "/usr/bin/apt full-upgrade -y"

Packages with configuration changes:
-grub-common 2.06-2ubuntu7.1 amd64
+grub-common 2.06-2ubuntu7.2 amd64

Package changes:
-fwupd-signed 1.51~22.04.1+1.2-3ubuntu0.2 amd64
+fwupd-signed 1.51.1~22.04.1+1.4-0ubuntu0.1 amd64
-grub-common 2.06-2ubuntu7.1 amd64
+grub-common 2.06-2ubuntu7.2 amd64
-grub-pc 2.06-2ubuntu7.1 amd64
-grub-pc-bin 2.06-2ubuntu7.1 amd64
-grub2-common 2.06-2ubuntu7.1 amd64
+grub-pc 2.06-2ubuntu7.2 amd64
+grub-pc-bin 2.06-2ubuntu7.2 amd64
+grub2-common 2.06-2ubuntu7.2 amd64
-libx11-6 2:1.7.5-1 amd64
-libx11-6 2:1.7.5-1 i386
-libx11-data 2:1.7.5-1 all
-libx11-dev 2:1.7.5-1 amd64
+libx11-6 2:1.7.5-1ubuntu0.2 amd64
+libx11-6 2:1.7.5-1ubuntu0.2 i386
+libx11-data 2:1.7.5-1ubuntu0.2 all
+libx11-dev 2:1.7.5-1ubuntu0.2 amd64
-libx11-xcb1 2:1.7.5-1 amd64
-libx11-xcb1 2:1.7.5-1 i386
+libx11-xcb1 2:1.7.5-1ubuntu0.2 amd64
+libx11-xcb1 2:1.7.5-1ubuntu0.2 i386
-osinfo-db 0.20220214-1ubuntu2.1 all
+osinfo-db 0.20230518-1ubuntu0.22.04.1 all
---

diff --git a/grub.d/20_linux_xen b/grub.d/20_linux_xen
index 3a27fc6..4600ea1 100755
--- a/grub.d/20_linux_xen
+++ b/grub.d/20_linux_xen
@@ -166,12 +166,12 @@ EOF
     message="$(gettext_printf "Loading initial ramdisk ...")"
     initrd_path=
     for i in ${initrd}; do
-       initrd_path="${initrd_path} ${rel_dirname}/${i}"
-    done
-    sed "s/^/$submenu_indentation/" << EOF
+       initrd_path="${rel_dirname}/${i}"
+       sed "s/^/$submenu_indentation/" << EOF
 	echo	'$(echo "$message" | grub_quote)'
 	${module_loader}	--nounzip   $(echo $initrd_path)
 EOF
+    done
   fi
   if ${xsm} && test -n "${xenpolicy}" ; then
     message="$(gettext_printf "Loading XSM policy ...")"
@@ -304,7 +304,10 @@ while [ "x${xen_list}" != "x" ] ; do
 
 	initrd=
 	if test -n "${initrd_early}" || test -n "${initrd_real}"; then
-	    initrd="${initrd_early} ${initrd_real}"
+	    # Xen assumes the real initrd is the first module after the kernel.
+	    # Additional (later) initrds can also be used for microcode update,
+	    # with Xen option 'ucode=<scan|module number> (non-default anyway).
+	    initrd="${initrd_real} ${initrd_early}"
 
 	    initrd_display=
 	    for i in ${initrd}; do