From: mhoellein Date: Fri, 3 Sep 2021 10:38:33 +0000 (+0200) Subject: committing changes in /etc made by "apt-get upgrade" X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=725696c7aa29739f9bf68832162b246e2651d136;p=vserver2 committing changes in /etc made by "apt-get upgrade" Package changes: -alsa-ucm-conf 1.2.2-1ubuntu0.8 all +alsa-ucm-conf 1.2.2-1ubuntu0.9 all -apache2 2.4.41-4ubuntu3.3 amd64 -apache2-bin 2.4.41-4ubuntu3.3 amd64 -apache2-data 2.4.41-4ubuntu3.3 all -apache2-utils 2.4.41-4ubuntu3.3 amd64 +apache2 2.4.41-4ubuntu3.4 amd64 +apache2-bin 2.4.41-4ubuntu3.4 amd64 +apache2-data 2.4.41-4ubuntu3.4 all +apache2-utils 2.4.41-4ubuntu3.4 amd64 -apt 2.0.5 amd64 -apt-transport-https 2.0.5 all -apt-utils 2.0.5 amd64 -base-files 11ubuntu5.3 amd64 +apt 2.0.6 amd64 +apt-transport-https 2.0.6 all +apt-utils 2.0.6 amd64 +base-files 11ubuntu5.4 amd64 -curl 7.68.0-1ubuntu2.5 amd64 +curl 7.68.0-1ubuntu2.6 amd64 -distro-info-data 0.43ubuntu1.5 all +distro-info-data 0.43ubuntu1.6 all -grub-common 2.04-1ubuntu26.12 amd64 +grub-common 2.04-1ubuntu26.13 amd64 -grub-pc 2.04-1ubuntu26.12 amd64 -grub-pc-bin 2.04-1ubuntu26.12 amd64 -grub2-common 2.04-1ubuntu26.12 amd64 +grub-pc 2.04-1ubuntu26.13 amd64 +grub-pc-bin 2.04-1ubuntu26.13 amd64 +grub2-common 2.04-1ubuntu26.13 amd64 -language-pack-en 1:20.04+20210121 all -language-pack-en-base 1:20.04+20210121 all -language-pack-gnome-en 1:20.04+20210121 all -language-pack-gnome-en-base 1:20.04+20210121 all +language-pack-en 1:20.04+20210802 all +language-pack-en-base 1:20.04+20210802 all +language-pack-gnome-en 1:20.04+20210802 all +language-pack-gnome-en-base 1:20.04+20210802 all -libapt-pkg6.0 2.0.5 amd64 +libapt-pkg6.0 2.0.6 amd64 -libavahi-client3 0.7-4ubuntu7 amd64 -libavahi-common-data 0.7-4ubuntu7 amd64 -libavahi-common3 0.7-4ubuntu7 amd64 +libavahi-client3 0.7-4ubuntu7.1 amd64 +libavahi-common-data 0.7-4ubuntu7.1 amd64 +libavahi-common3 0.7-4ubuntu7.1 amd64 -libcurl3-gnutls 7.68.0-1ubuntu2.5 amd64 -libcurl4 7.68.0-1ubuntu2.5 amd64 +libcurl3-gnutls 7.68.0-1ubuntu2.6 amd64 +libcurl4 7.68.0-1ubuntu2.6 amd64 -libdrm-common 2.4.102-1ubuntu1~20.04.1 all -libdrm2 2.4.102-1ubuntu1~20.04.1 amd64 +libdrm-common 2.4.105-3~20.04.1 all +libdrm2 2.4.105-3~20.04.1 amd64 -libglib2.0-0 2.64.6-1~ubuntu20.04.3 amd64 -libglib2.0-data 2.64.6-1~ubuntu20.04.3 all +libglib2.0-0 2.64.6-1~ubuntu20.04.4 amd64 +libglib2.0-data 2.64.6-1~ubuntu20.04.4 all -libgnutls30 3.6.13-2ubuntu1.3 amd64 +libgnutls30 3.6.13-2ubuntu1.6 amd64 -libmysqlclient21 8.0.25-0ubuntu0.20.04.1 amd64 +libmysqlclient21 8.0.26-0ubuntu0.20.04.2 amd64 -libnss-systemd 245.4-4ubuntu3.7 amd64 -libntfs-3g883 1:2017.3.23AR.3-3ubuntu1 amd64 +libnss-systemd 245.4-4ubuntu3.11 amd64 +libntfs-3g883 1:2017.3.23AR.3-3ubuntu1.1 amd64 -libpam-systemd 245.4-4ubuntu3.7 amd64 +libpam-systemd 245.4-4ubuntu3.11 amd64 -libpq5 12.7-0ubuntu0.20.04.1 amd64 +libpq5 12.8-0ubuntu0.20.04.1 amd64 -libpython3.8 3.8.5-1~20.04.3 amd64 -libpython3.8-minimal 3.8.5-1~20.04.3 amd64 -libpython3.8-stdlib 3.8.5-1~20.04.3 amd64 +libpython3.8 3.8.10-0ubuntu1~20.04 amd64 +libpython3.8-minimal 3.8.10-0ubuntu1~20.04 amd64 +libpython3.8-stdlib 3.8.10-0ubuntu1~20.04 amd64 -libsmbclient 2:4.11.6+dfsg-0ubuntu1.9 amd64 +libsmbclient 2:4.11.6+dfsg-0ubuntu1.10 amd64 -libssh-4 0.9.3-2ubuntu2.1 amd64 -libssl1.1 1.1.1f-1ubuntu2.4 amd64 +libssh-4 0.9.3-2ubuntu2.2 amd64 +libssl1.1 1.1.1f-1ubuntu2.8 amd64 -libsystemd0 245.4-4ubuntu3.7 amd64 +libsystemd0 245.4-4ubuntu3.11 amd64 -libudev1 245.4-4ubuntu3.7 amd64 +libudev1 245.4-4ubuntu3.11 amd64 -libuv1 1.34.2-1ubuntu1.1 amd64 +libuv1 1.34.2-1ubuntu1.3 amd64 -libwbclient0 2:4.11.6+dfsg-0ubuntu1.9 amd64 +libwbclient0 2:4.11.6+dfsg-0ubuntu1.10 amd64 -linux-base 4.5ubuntu3.1 all -linux-firmware 1.187.14 all +linux-base 4.5ubuntu3.6 all +linux-firmware 1.187.16 all -login 1:4.8.1-1ubuntu5.20.04 amd64 +login 1:4.8.1-1ubuntu5.20.04.1 amd64 -mysql-client-8.0 8.0.25-0ubuntu0.20.04.1 amd64 -mysql-client-core-8.0 8.0.25-0ubuntu0.20.04.1 amd64 +mysql-client-8.0 8.0.26-0ubuntu0.20.04.2 amd64 +mysql-client-core-8.0 8.0.26-0ubuntu0.20.04.2 amd64 -mysql-server 8.0.25-0ubuntu0.20.04.1 all +mysql-server 8.0.26-0ubuntu0.20.04.2 all -networkd-dispatcher 2.0.1-1 all -ntfs-3g 1:2017.3.23AR.3-3ubuntu1 amd64 -openssh-client 1:8.2p1-4ubuntu0.2 amd64 -openssh-server 1:8.2p1-4ubuntu0.2 amd64 -openssh-sftp-server 1:8.2p1-4ubuntu0.2 amd64 -openssl 1.1.1f-1ubuntu2.4 amd64 +networkd-dispatcher 2.1-2~ubuntu20.04.1 all +ntfs-3g 1:2017.3.23AR.3-3ubuntu1.1 amd64 +openssh-client 1:8.2p1-4ubuntu0.3 amd64 +openssh-server 1:8.2p1-4ubuntu0.3 amd64 +openssh-sftp-server 1:8.2p1-4ubuntu0.3 amd64 +openssl 1.1.1f-1ubuntu2.8 amd64 -passwd 1:4.8.1-1ubuntu5.20.04 amd64 +passwd 1:4.8.1-1ubuntu5.20.04.1 amd64 -postfix 3.4.13-0ubuntu1 amd64 +postfix 3.4.13-0ubuntu1.1 amd64 -python3-distupgrade 1:20.04.33 all +python3-distupgrade 1:20.04.36 all -python3-samba 2:4.11.6+dfsg-0ubuntu1.9 amd64 +python3-samba 2:4.11.6+dfsg-0ubuntu1.10 amd64 -python3.8 3.8.5-1~20.04.3 amd64 -python3.8-minimal 3.8.5-1~20.04.3 amd64 +python3.8 3.8.10-0ubuntu1~20.04 amd64 +python3.8-minimal 3.8.10-0ubuntu1~20.04 amd64 -samba-common 2:4.11.6+dfsg-0ubuntu1.9 all -samba-common-bin 2:4.11.6+dfsg-0ubuntu1.9 amd64 -samba-dsdb-modules 2:4.11.6+dfsg-0ubuntu1.9 amd64 -samba-libs 2:4.11.6+dfsg-0ubuntu1.9 amd64 +samba-common 2:4.11.6+dfsg-0ubuntu1.10 all +samba-common-bin 2:4.11.6+dfsg-0ubuntu1.10 amd64 +samba-dsdb-modules 2:4.11.6+dfsg-0ubuntu1.10 amd64 +samba-libs 2:4.11.6+dfsg-0ubuntu1.10 amd64 -smbclient 2:4.11.6+dfsg-0ubuntu1.9 amd64 +smbclient 2:4.11.6+dfsg-0ubuntu1.10 amd64 -systemd 245.4-4ubuntu3.7 amd64 -systemd-sysv 245.4-4ubuntu3.7 amd64 -systemd-timesyncd 245.4-4ubuntu3.7 amd64 +systemd 245.4-4ubuntu3.11 amd64 +systemd-sysv 245.4-4ubuntu3.11 amd64 +systemd-timesyncd 245.4-4ubuntu3.11 amd64 -ubuntu-release-upgrader-core 1:20.04.33 all +ubuntu-release-upgrader-core 1:20.04.36 all -udev 245.4-4ubuntu3.7 amd64 +udev 245.4-4ubuntu3.11 amd64 -wireless-regdb 2020.11.20-0ubuntu1~20.04.1 all +wireless-regdb 2021.07.14-0ubuntu1~20.04.1 all --- diff --git a/.etckeeper b/.etckeeper index 70095ba..70689b0 100755 --- a/.etckeeper +++ b/.etckeeper @@ -870,6 +870,7 @@ maybe chmod 0755 'kernel/install.d' maybe chmod 0755 'kernel/postinst.d' maybe chmod 0755 'kernel/postinst.d/apt-auto-removal' maybe chmod 0755 'kernel/postinst.d/initramfs-tools' +maybe chmod 0755 'kernel/postinst.d/xx-update-initrd-links' maybe chmod 0755 'kernel/postinst.d/zz-update-grub' maybe chmod 0755 'kernel/postrm.d' maybe chmod 0755 'kernel/postrm.d/initramfs-tools' @@ -1245,6 +1246,7 @@ maybe chmod 0755 'systemd/system/graphical.target.wants' maybe chmod 0755 'systemd/system/multi-user.target.wants' maybe chmod 0755 'systemd/system/paths.target.wants' maybe chmod 0664 'systemd/system/set-route-network.service' +maybe chmod 0755 'systemd/system/sleep.target.wants' maybe chmod 0755 'systemd/system/sockets.target.wants' maybe chmod 0755 'systemd/system/sysinit.target.wants' maybe chmod 0755 'systemd/system/timers.target.wants' diff --git a/dhcp/dhclient-enter-hooks.d/resolved b/dhcp/dhclient-enter-hooks.d/resolved index e3c7ed7..8e4f150 100755 --- a/dhcp/dhclient-enter-hooks.d/resolved +++ b/dhcp/dhclient-enter-hooks.d/resolved @@ -14,7 +14,7 @@ # (D) = master script downs interface # (-) = master script does nothing with this -if [ -x /lib/systemd/systemd-resolved ] ; then +if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then # For safety, first undefine the nasty default make_resolv_conf() make_resolv_conf() { : ; } case "$reason" in diff --git a/grub.d/10_linux b/grub.d/10_linux index 5a43f0c..a91bb2d 100755 --- a/grub.d/10_linux +++ b/grub.d/10_linux @@ -160,6 +160,12 @@ if [ "$vt_handoff" = 1 ]; then fi if [ x"$GRUB_FORCE_PARTUUID" != x ]; then + gettext_printf "GRUB_FORCE_PARTUUID is set, will attempt initrdless boot\n" >&2 + cat << EOF +# +# GRUB_FORCE_PARTUUID is set, will attempt initrdless boot +# Upon panic fallback to booting with initrd +EOF echo "set partuuid=${GRUB_FORCE_PARTUUID}" fi @@ -245,6 +251,8 @@ EOF linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}" fi message="$(gettext_printf "Loading initial ramdisk ...")" + initrdlessfail_msg="$(gettext_printf "GRUB_FORCE_PARTUUID set, initrdless boot failed. Attempting with initrd.")" + initrdlesstry_msg="$(gettext_printf "GRUB_FORCE_PARTUUID set, attempting initrdless boot.")" initrd_path= for i in ${initrd}; do initrd_path="${initrd_path} ${rel_dirname}/${i}" @@ -256,6 +264,7 @@ EOF if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then sed "s/^/$submenu_indentation/" << EOF if [ "\${initrdfail}" = 1 ]; then + echo '$(echo "$initrdlessfail_msg" | grub_quote)' linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} EOF if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then @@ -266,6 +275,7 @@ EOF sed "s/^/$submenu_indentation/" << EOF initrd $(echo $initrd_path) else + echo '$(echo "$initrdlesstry_msg" | grub_quote)' linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1 EOF if [ -n "$initrd_path_only_early" ]; then diff --git a/issue b/issue index 325e20c..356d87f 100644 --- a/issue +++ b/issue @@ -1,2 +1,2 @@ -Ubuntu 20.04.2 LTS \n \l +Ubuntu 20.04.3 LTS \n \l diff --git a/issue.net b/issue.net index 05040bf..55bc29e 100644 --- a/issue.net +++ b/issue.net @@ -1 +1 @@ -Ubuntu 20.04.2 LTS +Ubuntu 20.04.3 LTS diff --git a/kernel/postinst.d/xx-update-initrd-links b/kernel/postinst.d/xx-update-initrd-links new file mode 100755 index 0000000..51f2a39 --- /dev/null +++ b/kernel/postinst.d/xx-update-initrd-links @@ -0,0 +1,24 @@ +#!/bin/sh +set -e + +# installkernel script calls postinst.d without any DEB_MAINT_PARAMS set +# linux-image-* postinst calls postinst.d with DEB_MAINT_PARAMS set +# do nothing in case linux-image-* calls this, as it already calls `linux-update-symlinks` +[ -z "$DEB_MAINT_PARAMS" ] || exit 0 + +# installkernel must call postinst.d with two args, version & image_path +version="$1" +image_path="$2" + +[ -n "$version" ] || exit 0 +[ -n "$image_path" ] || exit 0 + +# call linux-update-symlinks in install mode, which will correctly +# update vmlinuz & initrd.img symlinks. Even if initrd.img does not +# exist yet, or has already been created by the initramfs-update +# postinst.d hook. It will also honor kernel_img.conf settings to +# link_in_boot yes/no. Thus matching behaviour of linux-image-* +# postinst call to linux-update-symlinks. +linux-update-symlinks install $version $image_path + +exit 0 diff --git a/lsb-release b/lsb-release index 9280468..53e8461 100644 --- a/lsb-release +++ b/lsb-release @@ -1,4 +1,4 @@ DISTRIB_ID=Ubuntu DISTRIB_RELEASE=20.04 DISTRIB_CODENAME=focal -DISTRIB_DESCRIPTION="Ubuntu 20.04.2 LTS" +DISTRIB_DESCRIPTION="Ubuntu 20.04.3 LTS" diff --git a/systemd/system/multi-user.target.wants/grub-common.service b/systemd/system/multi-user.target.wants/grub-common.service new file mode 120000 index 0000000..c0ca745 --- /dev/null +++ b/systemd/system/multi-user.target.wants/grub-common.service @@ -0,0 +1 @@ +/lib/systemd/system/grub-common.service \ No newline at end of file diff --git a/systemd/system/sleep.target.wants/grub-common.service b/systemd/system/sleep.target.wants/grub-common.service new file mode 120000 index 0000000..c0ca745 --- /dev/null +++ b/systemd/system/sleep.target.wants/grub-common.service @@ -0,0 +1 @@ +/lib/systemd/system/grub-common.service \ No newline at end of file