From: Frank Brehm Date: Sun, 4 Nov 2018 15:36:22 +0000 (+0100) Subject: committing changes in /etc after apt run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=f84833c84289b5aa0128eab4c1c34de1022f4ab9;p=config%2Fvera%2Fetc.git committing changes in /etc after apt run Package changes: -cpp-7 7.3.0-29 amd64 -cpp-8 8.2.0-8 amd64 +cpp-7 7.3.0-30 amd64 +cpp-8 8.2.0-9 amd64 -debian-archive-keyring 2017.7 all +debian-archive-keyring 2018.1 all -g++-8 8.2.0-8 amd64 +g++-8 8.2.0-9 amd64 -gcc-7 7.3.0-29 amd64 -gcc-7-base 7.3.0-29 amd64 -gcc-8 8.2.0-8 amd64 -gcc-8-base 8.2.0-8 amd64 +gcc-7 7.3.0-30 amd64 +gcc-7-base 7.3.0-30 amd64 +gcc-8 8.2.0-9 amd64 +gcc-8-base 8.2.0-9 amd64 -grub-common 2.02+dfsg1-6 amd64 -grub-pc 2.02+dfsg1-6 amd64 -grub-pc-bin 2.02+dfsg1-6 amd64 -grub2-common 2.02+dfsg1-6 amd64 +grub-common 2.02+dfsg1-8 amd64 +grub-pc 2.02+dfsg1-8 amd64 +grub-pc-bin 2.02+dfsg1-8 amd64 +grub2-common 2.02+dfsg1-8 amd64 -libalgorithm-diff-xs-perl 0.04-5 amd64 +libalgorithm-diff-xs-perl 0.04-5+b1 amd64 -libapparmor1 2.13.1-1 amd64 +libapparmor1 2.13.1-3+b1 amd64 -libasan4 7.3.0-29 amd64 -libasan5 8.2.0-8 amd64 +libasan4 7.3.0-30 amd64 +libasan5 8.2.0-9 amd64 -libatomic1 8.2.0-8 amd64 +libatomic1 8.2.0-9 amd64 -libcc1-0 8.2.0-8 amd64 -libcilkrts5 7.3.0-29 amd64 +libcc1-0 8.2.0-9 amd64 +libcilkrts5 7.3.0-30 amd64 -libcryptsetup12 2:2.0.4-3 amd64 +libcryptsetup12 2:2.0.5-1 amd64 -libfile-fcntllock-perl 0.22-3+b4 amd64 +libfile-fcntllock-perl 0.22-3+b5 amd64 -libgcc-7-dev 7.3.0-29 amd64 -libgcc-8-dev 8.2.0-8 amd64 -libgcc1 1:8.2.0-8 amd64 +libgcc-7-dev 7.3.0-30 amd64 +libgcc-8-dev 8.2.0-9 amd64 +libgcc1 1:8.2.0-9 amd64 -libgomp1 8.2.0-8 amd64 +libgomp1 8.2.0-9 amd64 -libitm1 8.2.0-8 amd64 +libitm1 8.2.0-9 amd64 -libldap-2.4-2 2.4.46+dfsg-5 amd64 +libldap-2.4-2 2.4.46+dfsg-5+b1 amd64 -liblocale-gettext-perl 1.07-3+b3 amd64 +liblocale-gettext-perl 1.07-3+b4 amd64 -liblsan0 8.2.0-8 amd64 +liblsan0 8.2.0-9 amd64 -libmpx2 8.2.0-8 amd64 +libmpx2 8.2.0-9 amd64 -libpcre2-8-0 10.31-3 amd64 +libpcre2-8-0 10.32-3 amd64 +libperl5.28 5.28.0-3 amd64 -libquadmath0 8.2.0-8 amd64 +libquadmath0 8.2.0-9 amd64 -libstdc++-8-dev 8.2.0-8 amd64 -libstdc++6 8.2.0-8 amd64 +libstdc++-8-dev 8.2.0-9 amd64 +libstdc++6 8.2.0-9 amd64 -libtext-charwidth-perl 0.04-7.1 amd64 -libtext-iconv-perl 1.7-5+b6 amd64 +libtext-charwidth-perl 0.04-7.1+b1 amd64 +libtext-iconv-perl 1.7-5+b7 amd64 -libtsan0 8.2.0-8 amd64 -libubsan0 7.3.0-29 amd64 -libubsan1 8.2.0-8 amd64 +libtsan0 8.2.0-9 amd64 +libubsan0 7.3.0-30 amd64 +libubsan1 8.2.0-9 amd64 -linux-image-4.18.0-2-amd64 4.18.10-2 amd64 +linux-image-4.18.0-2-amd64 4.18.10-2+b1 amd64 -linux-libc-dev 4.18.10-2 amd64 +linux-libc-dev 4.18.10-2+b1 amd64 -perl 5.26.2-7+b1 amd64 -perl-base 5.26.2-7+b1 amd64 +perl 5.28.0-3 amd64 +perl-base 5.28.0-3 amd64 +perl-modules-5.28 5.28.0-3 all -python-bcrypt 3.1.4-2 amd64 +python-bcrypt 3.1.4-3 amd64 -python3-bcrypt 3.1.4-2 amd64 +python3-bcrypt 3.1.4-3 amd64 -task-german 3.46 all -task-ssh-server 3.46 all -tasksel 3.46 all -tasksel-data 3.46 all +task-german 3.47 all +task-ssh-server 3.47 all +tasksel 3.47 all +tasksel-data 3.47 all -vim 2:8.1.0320-1 amd64 +vim 2:8.1.0320-1+b1 amd64 -vim-tiny 2:8.1.0320-1 amd64 +vim-tiny 2:8.1.0320-1+b1 amd64 -xxd 2:8.1.0320-1 amd64 +xxd 2:8.1.0320-1+b1 amd64 --- diff --git a/.etckeeper b/.etckeeper index f5e630b..5a2b78a 100755 --- a/.etckeeper +++ b/.etckeeper @@ -214,6 +214,8 @@ maybe chmod 0644 'default/crda' maybe chmod 0644 'default/cron' maybe chmod 0644 'default/dbus' maybe chmod 0644 'default/grub' +maybe chmod 0755 'default/grub.d' +maybe chmod 0644 'default/grub.d/init-select.cfg' maybe chmod 0644 'default/haveged' maybe chmod 0644 'default/hwclock' maybe chmod 0644 'default/keyboard' diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index 17e7773..7df5ef3 100644 --- a/apt/apt.conf.d/01autoremove-kernels +++ b/apt/apt.conf.d/01autoremove-kernels @@ -37,23 +37,23 @@ APT::NeverAutoRemove rc linux-image-4.11.0-1-amd64 4.11.6-1 amd64 Linux 4.11 for 64-bit PCs ii linux-image-4.17.0-3-amd64 4.17.17-1 amd64 Linux 4.17 for 64-bit PCs ii linux-image-4.18.0-1-amd64 4.18.6-1 amd64 Linux 4.18 for 64-bit PCs -iF linux-image-4.18.0-2-amd64 4.18.10-2 amd64 Linux 4.18 for 64-bit PCs +iF linux-image-4.18.0-2-amd64 4.18.10-2+b1 amd64 Linux 4.18 for 64-bit PCs rc linux-image-4.9.0-3-amd64 4.9.30-2+deb9u2 amd64 Linux 4.9 for 64-bit PCs -iU linux-image-amd64 4.18+99 amd64 Linux for 64-bit PCs (meta-package) +ii linux-image-amd64 4.18+99 amd64 Linux for 64-bit PCs (meta-package) # list of installed kernel packages: 4.17.0-3-amd64 4.17.17-1 4.18.0-1-amd64 4.18.6-1 -4.18.0-2-amd64 4.18.10-2 +4.18.0-2-amd64 4.18.10-2+b1 # list of different kernel versions: -4.18.10-2 +4.18.10-2+b1 4.18.6-1 4.17.17-1 -# Installing kernel: 4.18.10-2 (4.18.0-2-amd64) -# Running kernel: 4.18.6-1 (4.18.0-1-amd64) -# Last kernel: 4.18.10-2 +# Installing kernel: 4.18.10-2+b1 (4.18.0-2-amd64) +# Running kernel: 4.18.10-2+b1 (4.18.0-2-amd64) +# Last kernel: 4.18.10-2+b1 # Previous kernel: 4.18.6-1 # Kernel versions list to keep: -4.18.10-2 +4.18.10-2+b1 4.18.6-1 # Kernel packages (version part) to protect: 4\.18\.0-1-amd64 diff --git a/default/grub.d/init-select.cfg b/default/grub.d/init-select.cfg new file mode 100644 index 0000000..7fbfff8 --- /dev/null +++ b/default/grub.d/init-select.cfg @@ -0,0 +1,7 @@ +# Work around a bug in the obsolete init-select package which broke +# grub-mkconfig when init-select was removed but not purged. This file does +# nothing and will be removed in a later release. +# +# See: +# https://bugs.debian.org/858528 +# https://bugs.debian.org/863801 diff --git a/grub.d/10_linux b/grub.d/10_linux index f2ea195..187316f 100755 --- a/grub.d/10_linux +++ b/grub.d/10_linux @@ -81,7 +81,7 @@ case x"$GRUB_FS" in xzfs) rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`" - LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" + LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}" ;; esac diff --git a/grub.d/20_linux_xen b/grub.d/20_linux_xen index e436efa..fb3ed82 100755 --- a/grub.d/20_linux_xen +++ b/grub.d/20_linux_xen @@ -77,7 +77,7 @@ case x"$GRUB_FS" in xzfs) rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`" - LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" + LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}" ;; esac