committing changes in /etc made by "apt dist-upgrade -y"

Packages with configuration changes:
-base-files 11.1+deb11u4 amd64
+base-files 11.1+deb11u5 amd64
-grub-common 2.04-20 amd64
-grub2-common 2.04-20 amd64
+grub-common 2.06-3~deb11u1 amd64
+grub2-common 2.06-3~deb11u1 amd64

Package changes:
-base-files 11.1+deb11u4 amd64
+base-files 11.1+deb11u5 amd64
-clamav-base 0.103.6+dfsg-0+deb11u1 all
-clamav-daemon 0.103.6+dfsg-0+deb11u1 amd64
-clamav-freshclam 0.103.6+dfsg-0+deb11u1 amd64
+clamav-base 0.103.7+dfsg-0+deb11u1 all
+clamav-daemon 0.103.7+dfsg-0+deb11u1 amd64
+clamav-freshclam 0.103.7+dfsg-0+deb11u1 amd64
-curl 7.74.0-1.3+deb11u2 amd64
+curl 7.74.0-1.3+deb11u3 amd64
-dovecot-core 1:2.3.13+dfsg1-2 amd64
-dovecot-imapd 1:2.3.13+dfsg1-2 amd64
-dovecot-lmtpd 1:2.3.13+dfsg1-2 amd64
-dovecot-managesieved 1:2.3.13+dfsg1-2 amd64
-dovecot-mysql 1:2.3.13+dfsg1-2 amd64
-dovecot-pop3d 1:2.3.13+dfsg1-2 amd64
-dovecot-sieve 1:2.3.13+dfsg1-2 amd64
-dpkg 1.20.11 amd64
+dovecot-core 1:2.3.13+dfsg1-2+deb11u1 amd64
+dovecot-imapd 1:2.3.13+dfsg1-2+deb11u1 amd64
+dovecot-lmtpd 1:2.3.13+dfsg1-2+deb11u1 amd64
+dovecot-managesieved 1:2.3.13+dfsg1-2+deb11u1 amd64
+dovecot-mysql 1:2.3.13+dfsg1-2+deb11u1 amd64
+dovecot-pop3d 1:2.3.13+dfsg1-2+deb11u1 amd64
+dovecot-sieve 1:2.3.13+dfsg1-2+deb11u1 amd64
+dpkg 1.20.12 amd64
-grub-common 2.04-20 amd64
-grub-efi-amd64 2.04-20 amd64
-grub-efi-amd64-bin 2.04-20 amd64
-grub-pc-bin 2.04-20 amd64
-grub2-common 2.04-20 amd64
+grub-common 2.06-3~deb11u1 amd64
+grub-efi-amd64 2.06-3~deb11u1 amd64
+grub-efi-amd64-bin 2.06-3~deb11u1 amd64
+grub-pc-bin 2.06-3~deb11u1 amd64
+grub2-common 2.06-3~deb11u1 amd64
-libavahi-client3 0.8-5 amd64
-libavahi-common-data 0.8-5 amd64
-libavahi-common3 0.8-5 amd64
+libavahi-client3 0.8-5+deb11u1 amd64
+libavahi-common-data 0.8-5+deb11u1 amd64
+libavahi-common3 0.8-5+deb11u1 amd64
-libc-bin 2.31-13+deb11u3 amd64
-libc-l10n 2.31-13+deb11u3 all
-libc6 2.31-13+deb11u3 amd64
+libc-bin 2.31-13+deb11u4 amd64
+libc-l10n 2.31-13+deb11u4 all
+libc6 2.31-13+deb11u4 amd64
-libclamav9 0.103.6+dfsg-0+deb11u1 amd64
+libclamav9 0.103.7+dfsg-0+deb11u1 amd64
-libcurl3-gnutls 7.74.0-1.3+deb11u2 amd64
-libcurl4 7.74.0-1.3+deb11u2 amd64
+libcurl3-gnutls 7.74.0-1.3+deb11u3 amd64
+libcurl4 7.74.0-1.3+deb11u3 amd64
-libgssapi-krb5-2 1.18.3-6+deb11u1 amd64
+libgssapi-krb5-2 1.18.3-6+deb11u2 amd64
-libk5crypto3 1.18.3-6+deb11u1 amd64
+libk5crypto3 1.18.3-6+deb11u2 amd64
-libkrb5-3 1.18.3-6+deb11u1 amd64
-libkrb5support0 1.18.3-6+deb11u1 amd64
+libkrb5-3 1.18.3-6+deb11u2 amd64
+libkrb5support0 1.18.3-6+deb11u2 amd64
-libnss-systemd 247.3-7 amd64
+libnss-systemd 247.3-7+deb11u1 amd64
-libpam-systemd 247.3-7 amd64
+libpam-systemd 247.3-7+deb11u1 amd64
-libpcre2-8-0 10.36-2 amd64
+libpcre2-8-0 10.36-2+deb11u1 amd64
-libpq5 13.7-0+deb11u1 amd64
+libpq5 13.8-0+deb11u1 amd64
-libsystemd0 247.3-7 amd64
+libsystemd0 247.3-7+deb11u1 amd64
-libudev1 247.3-7 amd64
+libudev1 247.3-7+deb11u1 amd64
-linux-image-amd64 5.10.136-1 amd64
+linux-image-5.10.0-18-amd64 5.10.140-1 amd64
+linux-image-amd64 5.10.140-1 amd64
-locales 2.31-13+deb11u3 all
-locales-all 2.31-13+deb11u3 amd64
+locales 2.31-13+deb11u4 all
+locales-all 2.31-13+deb11u4 amd64
-mokutil 0.3.0+1538710437.fb6250f-1+b1 amd64
+mokutil 0.6.0-2~deb11u1 amd64
-publicsuffix 20211207.1025-0+deb11u1 all
+publicsuffix 20220811.1734-0+deb11u1 all
-systemd 247.3-7 amd64
-systemd-sysv 247.3-7 amd64
+systemd 247.3-7+deb11u1 amd64
+systemd-sysv 247.3-7+deb11u1 amd64
-udev 247.3-7 amd64
+udev 247.3-7+deb11u1 amd64

diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index 9fbb4491f1cad3e7fc4a7698df17c4b18645bfcf..a9deebb7b76abec184643397f2236b57f790d107 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -1,2 +1,2 @@
 // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal
-APT::LastInstalledKernel "5.10.0-17-amd64";
+APT::LastInstalledKernel "5.10.0-18-amd64";

diff --git a/debian_version b/debian_version
index 1c7134df6cf6b4091c7d8ef5a7e252d8b2d243db..8204473ef624a141734013d44cc2f630713b10a9 100644 (file)
--- a/debian_version
+++ b/debian_version
@@ -1 +1 @@
-11.4
+11.5

diff --git a/grub.d/10_linux b/grub.d/10_linux
index b0188199266843655e00c1d094ec6ecc1bac0b37..907a51452dad507607270b256977631439cb862c 100755 (executable)
--- a/grub.d/10_linux
+++ b/grub.d/10_linux
@@ -368,7 +368,15 @@ while [ "x$list" != "x" ] ; do
     fi
   fi
 
-  if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
+  # The GRUB_DISABLE_SUBMENU option used to be different than others since it was
+  # mentioned in the documentation that has to be set to 'y' instead of 'true' to
+  # enable it. This caused a lot of confusion to users that set the option to 'y',
+  # 'yes' or 'true'. This was fixed but all of these values must be supported now.
+  if [ "x${GRUB_DISABLE_SUBMENU}" = xyes ] || [ "x${GRUB_DISABLE_SUBMENU}" = xy ]; then
+    GRUB_DISABLE_SUBMENU="true"
+  fi
+
+  if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
     linux_entry "${OS}" "${version}" simple \
     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
 

diff --git a/grub.d/20_linux_xen b/grub.d/20_linux_xen
index 961fc7c2602abc0f554d6ec62a9e757501594e39..3a27fc6fc9ef19d8912d2a7538c76eedf7d9e8d0 100755 (executable)
--- a/grub.d/20_linux_xen
+++ b/grub.d/20_linux_xen
@@ -324,7 +324,15 @@ while [ "x${xen_list}" != "x" ] ; do
            fi
        fi
 
-       if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
+       # The GRUB_DISABLE_SUBMENU option used to be different than others since it was
+       # mentioned in the documentation that has to be set to 'y' instead of 'true' to
+       # enable it. This caused a lot of confusion to users that set the option to 'y',
+       # 'yes' or 'true'. This was fixed but all of these values must be supported now.
+       if [ "x${GRUB_DISABLE_SUBMENU}" = xyes ] || [ "x${GRUB_DISABLE_SUBMENU}" = xy ]; then
+           GRUB_DISABLE_SUBMENU="true"
+       fi
+
+       if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
            linux_entry "${OS}" "${version}" "${xen_version}" simple \
                "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
 

diff --git a/grub.d/30_os-prober b/grub.d/30_os-prober
index 30d1140c7f8629673b9c757368fad0d921f30b11..0445a5a48637e021421e9f1704c87891000239f1 100755 (executable)
--- a/grub.d/30_os-prober
+++ b/grub.d/30_os-prober
@@ -41,14 +41,17 @@ EOF
 }
 
 if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
+  grub_warn "$(gettext_printf "os-prober will not be executed to detect other bootable partitions.\nSystems on them will not be added to the GRUB boot configuration.\nCheck GRUB_DISABLE_OS_PROBER documentation entry.")"
   exit 0
 fi
 
-if [ -z "`which os-prober 2> /dev/null`" ] || [ -z "`which linux-boot-prober 2> /dev/null`" ] ; then
+if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/null ; then
   # missing os-prober and/or linux-boot-prober
   exit 0
 fi
 
+grub_warn "$(gettext_printf "os-prober will be executed to detect other bootable partitions.\nIts output will be used to detect bootable binaries on them and create new boot entries.")"
+
 OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
 if [ -z "${OSPROBED}" ] ; then
   # empty os-prober output, nothing doing
@@ -272,7 +275,15 @@ EOF
        fi
        used_osprober_linux_ids="$used_osprober_linux_ids 'osprober-gnulinux-$LKERNEL-${recovery_params}-$counter-$boot_device_id'"
 
-       if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
+       # The GRUB_DISABLE_SUBMENU option used to be different than others since it was
+       # mentioned in the documentation that has to be set to 'y' instead of 'true' to
+       # enable it. This caused a lot of confusion to users that set the option to 'y',
+       # 'yes' or 'true'. This was fixed but all of these values must be supported now.
+       if [ "x${GRUB_DISABLE_SUBMENU}" = xyes ] || [ "x${GRUB_DISABLE_SUBMENU}" = xy ]; then
+           GRUB_DISABLE_SUBMENU="true"
+       fi
+
+       if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
             cat << EOF
 menuentry '$(echo "$OS $onstr" | grub_quote)' $CLASS --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' {
 EOF

diff --git a/grub.d/30_uefi-firmware b/grub.d/30_uefi-firmware
index 3e525ba79add292f45675f0fdbb9e30e8e519690..73ce6e1f9506d3b58b2342a35a8723cc62380ba4 100755 (executable)
--- a/grub.d/30_uefi-firmware
+++ b/grub.d/30_uefi-firmware
@@ -2,7 +2,7 @@
 set -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2012  Free Software Foundation, Inc.
+# Copyright (C) 2020  Free Software Foundation, Inc.
 #
 # GRUB is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,19 +24,17 @@ datarootdir="/usr/share"
 export TEXTDOMAIN=grub
 export TEXTDOMAINDIR="${datarootdir}/locale"
 
-. "${datarootdir}/grub/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
 
-efi_vars_dir=/sys/firmware/efi/efivars
+EFI_VARS_DIR=/sys/firmware/efi/efivars
 EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c
-OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE"
+OS_INDICATIONS="$EFI_VARS_DIR/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE"
 
-if [ -e "$OsIndications" ] && \
-   [ "$(( $(printf 0x%x \'"$(cat $OsIndications | cut -b5)") & 1 ))" = 1 ]; then
-  LABEL="System setup"
+if [ -e "$OS_INDICATIONS" ] && \
+   [ "$(( $(printf 0x%x \'"$(cat $OS_INDICATIONS | cut -b5)"\') & 1 ))" = 1 ]; then
+  LABEL="UEFI Firmware Settings"
 
-  gettext_printf "Adding boot menu entry for EFI firmware configuration\n" >&2
-
-  onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
+  gettext_printf "Adding boot menu entry for UEFI Firmware Settings ...\n" >&2
 
   cat << EOF
 menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {

diff --git a/grub.d/41_custom b/grub.d/41_custom
index fcc21a987e10e1efbe530c066257b7c67249f533..a08363da18e92de9c34a514569d09c5bf1966236 100755 (executable)
--- a/grub.d/41_custom
+++ b/grub.d/41_custom
@@ -3,7 +3,7 @@ cat <<EOF
 if [ -f  \${config_directory}/custom.cfg ]; then
   source \${config_directory}/custom.cfg
 elif [ -z "\${config_directory}" -a -f  \$prefix/custom.cfg ]; then
-  source \$prefix/custom.cfg;
+  source \$prefix/custom.cfg
 fi
 EOF
 

diff --git a/kernel/postinst.d/zz-update-grub b/kernel/postinst.d/zz-update-grub
index 5ed065fb119fd9d36f9beddacef701cc50cd05f7..952105769cc4ff798737606cac542e931495f178 100755 (executable)
--- a/kernel/postinst.d/zz-update-grub
+++ b/kernel/postinst.d/zz-update-grub
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-which update-grub >/dev/null 2>&1 || exit 0
+command -v update-grub >/dev/null || exit 0
 
 if type systemd-detect-virt >/dev/null 2>&1 &&
    systemd-detect-virt --quiet --container; then

diff --git a/kernel/postrm.d/zz-update-grub b/kernel/postrm.d/zz-update-grub
index 5ed065fb119fd9d36f9beddacef701cc50cd05f7..952105769cc4ff798737606cac542e931495f178 100755 (executable)
--- a/kernel/postrm.d/zz-update-grub
+++ b/kernel/postrm.d/zz-update-grub
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-which update-grub >/dev/null 2>&1 || exit 0
+command -v update-grub >/dev/null || exit 0
 
 if type systemd-detect-virt >/dev/null 2>&1 &&
    systemd-detect-virt --quiet --container; then