From 15e8d3eff97a3371c87b6895cb89c414b0bc64d8 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 12 Sep 2022 10:05:17 +0200 Subject: [PATCH] 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 -curl 7.74.0-1.3+deb11u2 amd64 +curl 7.74.0-1.3+deb11u3 amd64 -dpkg 1.20.11 amd64 -dpkg-dev 1.20.11 all +dpkg 1.20.12 amd64 +dpkg-dev 1.20.12 all -grub-common 2.04-20 amd64 -grub-pc 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-pc 2.06-3~deb11u1 amd64 +grub-pc-bin 2.06-3~deb11u1 amd64 +grub2-common 2.06-3~deb11u1 amd64 -krb5-locales 1.18.3-6+deb11u1 all +krb5-locales 1.18.3-6+deb11u2 all -libc-bin 2.31-13+deb11u3 amd64 -libc-dev-bin 2.31-13+deb11u3 amd64 -libc-l10n 2.31-13+deb11u3 all -libc6 2.31-13+deb11u3 amd64 -libc6-dev 2.31-13+deb11u3 amd64 -libc6-dev-i386 2.31-13+deb11u3 amd64 -libc6-dev-x32 2.31-13+deb11u3 amd64 -libc6-i386 2.31-13+deb11u3 amd64 -libc6-x32 2.31-13+deb11u3 amd64 +libc-bin 2.31-13+deb11u4 amd64 +libc-dev-bin 2.31-13+deb11u4 amd64 +libc-l10n 2.31-13+deb11u4 all +libc6 2.31-13+deb11u4 amd64 +libc6-dev 2.31-13+deb11u4 amd64 +libc6-dev-i386 2.31-13+deb11u4 amd64 +libc6-dev-x32 2.31-13+deb11u4 amd64 +libc6-i386 2.31-13+deb11u4 amd64 +libc6-x32 2.31-13+deb11u4 amd64 -libcurl3-gnutls 7.74.0-1.3+deb11u2 amd64 -libcurl4 7.74.0-1.3+deb11u2 amd64 -libcurl4-gnutls-dev 7.74.0-1.3+deb11u2 amd64 +libcurl3-gnutls 7.74.0-1.3+deb11u3 amd64 +libcurl4 7.74.0-1.3+deb11u3 amd64 +libcurl4-gnutls-dev 7.74.0-1.3+deb11u3 amd64 -libdpkg-perl 1.20.11 all +libdpkg-perl 1.20.12 all -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 -libpam-systemd 247.3-7 amd64 +libpam-systemd 247.3-7+deb11u1 amd64 -libpcre2-16-0 10.36-2 amd64 -libpcre2-32-0 10.36-2 amd64 -libpcre2-8-0 10.36-2 amd64 -libpcre2-dev 10.36-2 amd64 -libpcre2-posix2 10.36-2 amd64 +libpcre2-16-0 10.36-2+deb11u1 amd64 +libpcre2-32-0 10.36-2+deb11u1 amd64 +libpcre2-8-0 10.36-2+deb11u1 amd64 +libpcre2-dev 10.36-2+deb11u1 amd64 +libpcre2-posix2 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-libc-dev 5.10.136-1 amd64 -locales 2.31-13+deb11u3 all +linux-image-5.10.0-18-amd64 5.10.140-1 amd64 +linux-image-amd64 5.10.140-1 amd64 +linux-libc-dev 5.10.140-1 amd64 +locales 2.31-13+deb11u4 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 --- apt/apt.conf.d/01autoremove-kernels | 2 +- debian_version | 2 +- grub.d/10_linux | 10 +++++++++- grub.d/20_linux_xen | 10 +++++++++- grub.d/30_os-prober | 15 +++++++++++++-- grub.d/30_uefi-firmware | 18 ++++++++---------- grub.d/41_custom | 2 +- kernel/postinst.d/zz-update-grub | 2 +- kernel/postrm.d/zz-update-grub | 2 +- 9 files changed, 44 insertions(+), 19 deletions(-) diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index 9fbb449..a9deebb 100644 --- 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 1c7134d..8204473 100644 --- 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 b018819..907a514 100755 --- 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 961fc7c..3a27fc6 100755 --- 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 30d1140..0445a5a 100755 --- 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 3e525ba..73ce6e1 100755 --- 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 fcc21a9..a08363d 100755 --- a/grub.d/41_custom +++ b/grub.d/41_custom @@ -3,7 +3,7 @@ cat </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 5ed065f..9521057 100755 --- 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 -- 2.39.5