From 9d5d0bb7463ac97f5aea62c53b229c7f9f8549f2 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 12 May 2020 00:24:54 +0200 Subject: [PATCH] committing changes in /etc made by "apt dist-upgrade -y" Package changes: -base-files 10.3+deb10u3 amd64 +base-files 10.3+deb10u4 amd64 -distro-info-data 0.41+deb10u1 all +distro-info-data 0.41+deb10u2 all -iputils-ping 3:20180629-2 amd64 +iputils-ping 3:20180629-2+deb10u1 amd64 -libcups2 2.2.10-6+deb10u2 amd64 +libcups2 2.2.10-6+deb10u3 amd64 -libfuse2 2.9.9-1 amd64 +libfuse2 2.9.9-1+deb10u1 amd64 -libldap-2.4-2 2.4.47+dfsg-3+deb10u1 amd64 -libldap-common 2.4.47+dfsg-3+deb10u1 all +libldap-2.4-2 2.4.47+dfsg-3+deb10u2 amd64 +libldap-common 2.4.47+dfsg-3+deb10u2 all -libpam-systemd 241-7~deb10u3 amd64 +libpam-systemd 241-7~deb10u4 amd64 -libssh-gcrypt-4 0.8.7-1 amd64 +libssh-gcrypt-4 0.8.7-1+deb10u1 amd64 -libsystemd0 241-7~deb10u3 amd64 +libsystemd0 241-7~deb10u4 amd64 -libudev1 241-7~deb10u3 amd64 +libudev1 241-7~deb10u4 amd64 -linux-image-4.19.0-8-amd64 4.19.98-1 amd64 -linux-image-amd64 4.19+105+deb10u3 amd64 -linux-libc-dev 4.19.98-1 amd64 +linux-image-4.19.0-8-amd64 4.19.98-1+deb10u1 amd64 +linux-image-4.19.0-9-amd64 4.19.118-2 amd64 +linux-image-amd64 4.19+105+deb10u4 amd64 +linux-libc-dev 4.19.118-2 amd64 -postfix 3.4.8-0+10debu1 amd64 -postfix-mysql 3.4.8-0+10debu1 amd64 -postfix-pcre 3.4.8-0+10debu1 amd64 -postfix-sqlite 3.4.8-0+10debu1 amd64 +postfix 3.4.10-0+deb10u1 amd64 +postfix-mysql 3.4.10-0+deb10u1 amd64 +postfix-pcre 3.4.10-0+deb10u1 amd64 +postfix-sqlite 3.4.10-0+deb10u1 amd64 -rake 12.3.1-3 all +rake 12.3.1-3+deb10u1 all -rubygems-integration 1.11 all +rubygems-integration 1.11+deb10u1 all -salt-common 3000.1+ds-1 all -salt-minion 3000.1+ds-1 all +salt-common 3000.2+ds-1 all +salt-minion 3000.2+ds-1 all -systemd 241-7~deb10u3 amd64 -systemd-sysv 241-7~deb10u3 amd64 +systemd 241-7~deb10u4 amd64 +systemd-sysv 241-7~deb10u4 amd64 -tzdata 2019c-0+deb10u1 all +tzdata 2020a-0+deb10u1 all -udev 241-7~deb10u3 amd64 +udev 241-7~deb10u4 amd64 --- apt/apt.conf.d/01autoremove-kernels | 64 ++++++++++++++--------------- debian_version | 2 +- init.d/postfix | 8 ++-- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index af19013..748ad63 100644 --- a/apt/apt.conf.d/01autoremove-kernels +++ b/apt/apt.conf.d/01autoremove-kernels @@ -1,65 +1,65 @@ // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal APT::NeverAutoRemove { - "^linux-image-4\.19\.0-6-amd64$"; "^linux-image-4\.19\.0-8-amd64$"; - "^linux-headers-4\.19\.0-6-amd64$"; + "^linux-image-4\.19\.0-9-amd64$"; "^linux-headers-4\.19\.0-8-amd64$"; - "^linux-image-extra-4\.19\.0-6-amd64$"; + "^linux-headers-4\.19\.0-9-amd64$"; "^linux-image-extra-4\.19\.0-8-amd64$"; - "^linux-modules-4\.19\.0-6-amd64$"; + "^linux-image-extra-4\.19\.0-9-amd64$"; "^linux-modules-4\.19\.0-8-amd64$"; - "^linux-modules-extra-4\.19\.0-6-amd64$"; + "^linux-modules-4\.19\.0-9-amd64$"; "^linux-modules-extra-4\.19\.0-8-amd64$"; - "^linux-signed-image-4\.19\.0-6-amd64$"; + "^linux-modules-extra-4\.19\.0-9-amd64$"; "^linux-signed-image-4\.19\.0-8-amd64$"; - "^linux-image-unsigned-4\.19\.0-6-amd64$"; + "^linux-signed-image-4\.19\.0-9-amd64$"; "^linux-image-unsigned-4\.19\.0-8-amd64$"; - "^kfreebsd-image-4\.19\.0-6-amd64$"; + "^linux-image-unsigned-4\.19\.0-9-amd64$"; "^kfreebsd-image-4\.19\.0-8-amd64$"; - "^kfreebsd-headers-4\.19\.0-6-amd64$"; + "^kfreebsd-image-4\.19\.0-9-amd64$"; "^kfreebsd-headers-4\.19\.0-8-amd64$"; - "^gnumach-image-4\.19\.0-6-amd64$"; + "^kfreebsd-headers-4\.19\.0-9-amd64$"; "^gnumach-image-4\.19\.0-8-amd64$"; - "^.*-modules-4\.19\.0-6-amd64$"; + "^gnumach-image-4\.19\.0-9-amd64$"; "^.*-modules-4\.19\.0-8-amd64$"; - "^.*-kernel-4\.19\.0-6-amd64$"; + "^.*-modules-4\.19\.0-9-amd64$"; "^.*-kernel-4\.19\.0-8-amd64$"; - "^linux-backports-modules-.*-4\.19\.0-6-amd64$"; + "^.*-kernel-4\.19\.0-9-amd64$"; "^linux-backports-modules-.*-4\.19\.0-8-amd64$"; - "^linux-modules-.*-4\.19\.0-6-amd64$"; + "^linux-backports-modules-.*-4\.19\.0-9-amd64$"; "^linux-modules-.*-4\.19\.0-8-amd64$"; - "^linux-tools-4\.19\.0-6-amd64$"; + "^linux-modules-.*-4\.19\.0-9-amd64$"; "^linux-tools-4\.19\.0-8-amd64$"; - "^linux-cloud-tools-4\.19\.0-6-amd64$"; + "^linux-tools-4\.19\.0-9-amd64$"; "^linux-cloud-tools-4\.19\.0-8-amd64$"; - "^linux-buildinfo-4\.19\.0-6-amd64$"; + "^linux-cloud-tools-4\.19\.0-9-amd64$"; "^linux-buildinfo-4\.19\.0-8-amd64$"; - "^linux-source-4\.19\.0-6-amd64$"; + "^linux-buildinfo-4\.19\.0-9-amd64$"; "^linux-source-4\.19\.0-8-amd64$"; + "^linux-source-4\.19\.0-9-amd64$"; }; /* Debug information: # dpkg list: ii linux-image-4.19.0-6-amd64 4.19.67-2+deb10u2 amd64 Linux 4.19 for 64-bit PCs (signed) -iF linux-image-4.19.0-8-amd64 4.19.98-1 amd64 Linux 4.19 for 64-bit PCs (signed) -ii linux-image-4.9.0-11-amd64 4.9.189-3+deb9u1 amd64 Linux 4.9 for 64-bit PCs -iU linux-image-amd64 4.19+105+deb10u3 amd64 Linux for 64-bit PCs (meta-package) +iF linux-image-4.19.0-8-amd64 4.19.98-1+deb10u1 amd64 Linux 4.19 for 64-bit PCs (signed) +ii linux-image-4.19.0-9-amd64 4.19.118-2 amd64 Linux 4.19 for 64-bit PCs (signed) +ii linux-image-amd64 4.19+105+deb10u4 amd64 Linux for 64-bit PCs (meta-package) # list of installed kernel packages: 4.19.0-6-amd64 4.19.67-2+deb10u2 -4.19.0-8-amd64 4.19.98-1 -4.9.0-11-amd64 4.9.189-3+deb9u1 +4.19.0-8-amd64 4.19.98-1+deb10u1 +4.19.0-9-amd64 4.19.118-2 # list of different kernel versions: -4.19.98-1 +4.19.118-2 +4.19.98-1+deb10u1 4.19.67-2+deb10u2 -4.9.189-3+deb9u1 -# Installing kernel: 4.19.98-1 (4.19.0-8-amd64) -# Running kernel: 4.19.67-2+deb10u2 (4.19.0-6-amd64) -# Last kernel: 4.19.98-1 -# Previous kernel: 4.19.67-2+deb10u2 +# Installing kernel: 4.19.98-1+deb10u1 (4.19.0-8-amd64) +# Running kernel: 4.19.98-1+deb10u1 (4.19.0-8-amd64) +# Last kernel: 4.19.118-2 +# Previous kernel: 4.19.98-1+deb10u1 # Kernel versions list to keep: -4.19.67-2+deb10u2 -4.19.98-1 +4.19.118-2 +4.19.98-1+deb10u1 # Kernel packages (version part) to protect: -4\.19\.0-6-amd64 4\.19\.0-8-amd64 +4\.19\.0-9-amd64 */ diff --git a/debian_version b/debian_version index 260e375..1be519c 100644 --- a/debian_version +++ b/debian_version @@ -1 +1 @@ -10.3 +10.4 diff --git a/init.d/postfix b/init.d/postfix index bc09928..d8da282 100755 --- a/init.d/postfix +++ b/init.d/postfix @@ -35,12 +35,14 @@ enabled_instances() { running() { INSTANCE="$1" if [ "X$INSTANCE" = X ]; then - POSTCONF="postconf" + POSTMULTI="" else - POSTCONF="postmulti -i $INSTANCE -x postconf" + POSTMULTI="postmulti -i $INSTANCE -x " fi + POSTCONF="${POSTMULTI} postconf" + daemon_directory=$($POSTCONF -hx daemon_directory 2>/dev/null || echo /usr/lib/postfix/sbin) - if ! $daemon_directory/master -t 2>/dev/null ; then + if ! ${POSTMULTI} $daemon_directory/master -t 2>/dev/null ; then echo y fi } -- 2.39.5