From a3a521e9075a4a8712a83ebf938c8f2f615267c7 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Sun, 7 Jan 2018 19:30:26 +0100 Subject: [PATCH] committing changes in /etc after apt run Package changes: -ack 2.20-1 all -ack-grep 2.20-1 all +ack 2.22-1 all +ack-grep 2.22-1 all -apt-listchanges 3.14 all +apt-listchanges 3.15 all -bsdmainutils 9.0.14 amd64 +bsdmainutils 11.1.2 amd64 -console-setup 1.173 all -console-setup-linux 1.173 all +console-setup 1.174 all +console-setup-linux 1.174 all -debianutils 4.8.3 amd64 +debianutils 4.8.4 amd64 -git 1:2.15.1-1 amd64 -git-email 1:2.15.1-1 all -git-man 1:2.15.1-1 all +git 1:2.15.1-3 amd64 +git-email 1:2.15.1-3 all +git-man 1:2.15.1-3 all -installation-report 2.65 all -iproute2 4.13.0-1 amd64 +installation-report 2.66 all +iproute2 4.14.1-1 amd64 -keyboard-configuration 1.173 all -klibc-utils 2.0.4-9 amd64 +keyboard-configuration 1.174 all +klibc-utils 2.0.4-11 amd64 -libc-bin 2.25-3 amd64 -libc-dev-bin 2.25-3 amd64 -libc-l10n 2.25-3 all -libc6 2.25-3 amd64 -libc6-dev 2.25-3 amd64 +libc-bin 2.25-5 amd64 +libc-dev-bin 2.25-5 amd64 +libc-l10n 2.25-5 all +libc6 2.25-5 amd64 +libc6-dev 2.25-5 amd64 -libcwidget3v5 0.5.17-6 amd64 +libcwidget3v5 0.5.17-7 amd64 -libdebconfclient0 0.232 amd64 +libdebconfclient0 0.237 amd64 -libelf1 0.170-0.1 amd64 +libelf1 0.170-0.2 amd64 -libexpat1 2.2.3-2 amd64 +libexpat1 2.2.5-3 amd64 -libfastjson4 0.99.7-1 amd64 +libfastjson4 0.99.8-1 amd64 -libglib2.0-0 2.54.1-1 amd64 -libglib2.0-data 2.54.1-1 all +libglib2.0-0 2.54.2-5 amd64 +libglib2.0-data 2.54.2-5 all -libjs-sphinxdoc 1.6.5-2 all +libjs-sphinxdoc 1.6.5-4 all -libklibc 2.0.4-9 amd64 +libklibc 2.0.4-11 amd64 -libnghttp2-14 1.28.0-1 amd64 +libnghttp2-14 1.29.0-1 amd64 +libnorm1 1.5r6+dfsg1-6 amd64 -libpam-systemd 236-1 amd64 +libpam-systemd 236-2 amd64 -libpcap0.8 1.8.1-5 amd64 +libpcap0.8 1.8.1-6 amd64 -libpcsclite1 1.8.22-1 amd64 +libpcsclite1 1.8.23-1 amd64 -libpython3-stdlib 3.6.3-2 amd64 -libpython3.6-minimal 3.6.4~rc1-1 amd64 -libpython3.6-stdlib 3.6.4~rc1-1 amd64 +libpython3-stdlib 3.6.4-1 amd64 +libpython3.6-minimal 3.6.4-2 amd64 +libpython3.6-stdlib 3.6.4-2 amd64 +libsodium23 1.0.16-2 amd64 -libsystemd0 236-1 amd64 +libsystemd0 236-2 amd64 -libudev1 236-1 amd64 +libudev1 236-2 amd64 -libxml2 2.9.4+dfsg1-5.2 amd64 +libxml2 2.9.4+dfsg1-6.1 amd64 -libzmq5 4.2.2-1 amd64 +libzmq5 4.2.3-1+b1 amd64 +linux-image-4.14.0-2-amd64 4.14.7-1 amd64 -linux-image-amd64 4.13+86 amd64 -linux-libc-dev 4.13.13-1 amd64 -locales 2.25-3 all +linux-image-amd64 4.14+88 amd64 +linux-libc-dev 4.14.7-1 amd64 +locales 2.25-5 all -multiarch-support 2.25-3 amd64 +multiarch-support 2.25-5 amd64 -python-asn1crypto 0.22.0-1 all +python-asn1crypto 0.24.0-1 all -python-backports-shutil-get-terminal-size 1.0.0-3 all +python-backports-shutil-get-terminal-size 1.0.0-5 all -python-pkg-resources 38.2.4-1 all +python-pkg-resources 38.2.4-2 all -python-setuptools 38.2.4-1 all +python-setuptools 38.2.4-2 all -python3 3.6.3-2 amd64 -python3-all 3.6.3-2 amd64 +python3 3.6.4-1 amd64 +python3-all 3.6.4-1 amd64 -python3-asn1crypto 0.22.0-1 all +python3-asn1crypto 0.24.0-1 all +python3-distutils 3.6.4-2 all -python3-minimal 3.6.3-2 amd64 +python3-lib2to3 3.6.4-2 all +python3-minimal 3.6.4-1 amd64 -python3-pkg-resources 38.2.4-1 all +python3-pkg-resources 38.2.4-2 all -python3-reportbug 7.1.7 all +python3-reportbug 7.1.8 all -python3-setuptools 38.2.4-1 all +python3-setuptools 38.2.4-2 all -python3.6 3.6.4~rc1-1 amd64 -python3.6-minimal 3.6.4~rc1-1 amd64 +python3.6 3.6.4-2 amd64 +python3.6-minimal 3.6.4-2 amd64 -reportbug 7.1.7 all +reportbug 7.1.8 all -sudo 1.8.21p2-2 amd64 -systemd 236-1 amd64 -systemd-sysv 236-1 amd64 +sudo 1.8.21p2-3 amd64 +systemd 236-2 amd64 +systemd-sysv 236-2 amd64 -udev 236-1 amd64 +udev 236-2 amd64 -vim 2:8.0.1401-1 amd64 -vim-common 2:8.0.1401-1 all -vim-runtime 2:8.0.1401-1 all -vim-tiny 2:8.0.1401-1 amd64 +vim 2:8.0.1401-2 amd64 +vim-common 2:8.0.1401-2 all +vim-runtime 2:8.0.1401-2 all +vim-tiny 2:8.0.1401-2 amd64 -whois 5.2.19 amd64 +whois 5.2.20 amd64 -wpasupplicant 2:2.4-1.1 amd64 +wpasupplicant 2:2.6-15 amd64 -xxd 2:8.0.1401-1 amd64 +xxd 2:8.0.1401-2 amd64 --- apt/apt.conf.d/01autoremove-kernels | 39 ++++++++++--------- console-setup/cached_setup_keyboard.sh | 2 +- dbus-1/system.d/wpa_supplicant.conf | 2 - ld.so.conf.d/x86_64-linux-gnu.conf | 1 + .../system/dbus-fi.w1.wpa_supplicant1.service | 1 + .../wpa_supplicant.service | 1 + wpa_supplicant/functions.sh | 6 +-- 7 files changed, 27 insertions(+), 25 deletions(-) create mode 120000 systemd/system/dbus-fi.w1.wpa_supplicant1.service create mode 120000 systemd/system/multi-user.target.wants/wpa_supplicant.service diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index a213dc4..f5d5f20 100644 --- a/apt/apt.conf.d/01autoremove-kernels +++ b/apt/apt.conf.d/01autoremove-kernels @@ -1,50 +1,53 @@ // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal APT::NeverAutoRemove { - "^linux-image-4\.12\.0-1-amd64$"; "^linux-image-4\.13\.0-1-amd64$"; - "^linux-headers-4\.12\.0-1-amd64$"; + "^linux-image-4\.14\.0-2-amd64$"; "^linux-headers-4\.13\.0-1-amd64$"; - "^linux-image-extra-4\.12\.0-1-amd64$"; + "^linux-headers-4\.14\.0-2-amd64$"; "^linux-image-extra-4\.13\.0-1-amd64$"; - "^linux-signed-image-4\.12\.0-1-amd64$"; + "^linux-image-extra-4\.14\.0-2-amd64$"; "^linux-signed-image-4\.13\.0-1-amd64$"; - "^kfreebsd-image-4\.12\.0-1-amd64$"; + "^linux-signed-image-4\.14\.0-2-amd64$"; "^kfreebsd-image-4\.13\.0-1-amd64$"; - "^kfreebsd-headers-4\.12\.0-1-amd64$"; + "^kfreebsd-image-4\.14\.0-2-amd64$"; "^kfreebsd-headers-4\.13\.0-1-amd64$"; - "^gnumach-image-4\.12\.0-1-amd64$"; + "^kfreebsd-headers-4\.14\.0-2-amd64$"; "^gnumach-image-4\.13\.0-1-amd64$"; - "^.*-modules-4\.12\.0-1-amd64$"; + "^gnumach-image-4\.14\.0-2-amd64$"; "^.*-modules-4\.13\.0-1-amd64$"; - "^.*-kernel-4\.12\.0-1-amd64$"; + "^.*-modules-4\.14\.0-2-amd64$"; "^.*-kernel-4\.13\.0-1-amd64$"; - "^linux-backports-modules-.*-4\.12\.0-1-amd64$"; + "^.*-kernel-4\.14\.0-2-amd64$"; "^linux-backports-modules-.*-4\.13\.0-1-amd64$"; - "^linux-tools-4\.12\.0-1-amd64$"; + "^linux-backports-modules-.*-4\.14\.0-2-amd64$"; "^linux-tools-4\.13\.0-1-amd64$"; + "^linux-tools-4\.14\.0-2-amd64$"; }; /* Debug information: # dpkg list: rc linux-image-4.11.0-1-amd64 4.11.6-1 amd64 Linux 4.11 for 64-bit PCs ii linux-image-4.12.0-1-amd64 4.12.6-1 amd64 Linux 4.12 for 64-bit PCs -iF linux-image-4.13.0-1-amd64 4.13.13-1 amd64 Linux 4.13 for 64-bit PCs +ii linux-image-4.13.0-1-amd64 4.13.13-1 amd64 Linux 4.13 for 64-bit PCs +iF linux-image-4.14.0-2-amd64 4.14.7-1 amd64 Linux 4.14 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 -ii linux-image-amd64 4.13+86 amd64 Linux for 64-bit PCs (meta-package) +iU linux-image-amd64 4.14+88 amd64 Linux for 64-bit PCs (meta-package) # list of installed kernel packages: 4.12.0-1-amd64 4.12.6-1 4.13.0-1-amd64 4.13.13-1 +4.14.0-2-amd64 4.14.7-1 # list of different kernel versions: +4.14.7-1 4.13.13-1 4.12.6-1 -# Installing kernel: 4.13.13-1 (4.13.0-1-amd64) +# Installing kernel: 4.14.7-1 (4.14.0-2-amd64) # Running kernel: 4.13.13-1 (4.13.0-1-amd64) -# Last kernel: 4.13.13-1 -# Previous kernel: 4.12.6-1 +# Last kernel: 4.14.7-1 +# Previous kernel: 4.13.13-1 # Kernel versions list to keep: -4.12.6-1 4.13.13-1 +4.14.7-1 # Kernel packages (version part) to protect: -4\.12\.0-1-amd64 4\.13\.0-1-amd64 +4\.14\.0-2-amd64 */ diff --git a/console-setup/cached_setup_keyboard.sh b/console-setup/cached_setup_keyboard.sh index 0535814..a58be3f 100755 --- a/console-setup/cached_setup_keyboard.sh +++ b/console-setup/cached_setup_keyboard.sh @@ -10,4 +10,4 @@ kbd_mode '-u' < '/dev/tty3' kbd_mode '-u' < '/dev/tty4' kbd_mode '-u' < '/dev/tty5' kbd_mode '-u' < '/dev/tty6' -loadkeys '/tmp/tmpkbd.SDQJzK' > '/dev/null' +loadkeys '/tmp/tmpkbd.mGUH4w' > '/dev/null' diff --git a/dbus-1/system.d/wpa_supplicant.conf b/dbus-1/system.d/wpa_supplicant.conf index e1fb010..e375cdc 100644 --- a/dbus-1/system.d/wpa_supplicant.conf +++ b/dbus-1/system.d/wpa_supplicant.conf @@ -25,11 +25,9 @@ - - diff --git a/ld.so.conf.d/x86_64-linux-gnu.conf b/ld.so.conf.d/x86_64-linux-gnu.conf index 4856a62..cd691ab 100644 --- a/ld.so.conf.d/x86_64-linux-gnu.conf +++ b/ld.so.conf.d/x86_64-linux-gnu.conf @@ -1,3 +1,4 @@ # Multiarch support +/usr/local/lib/x86_64-linux-gnu /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu diff --git a/systemd/system/dbus-fi.w1.wpa_supplicant1.service b/systemd/system/dbus-fi.w1.wpa_supplicant1.service new file mode 120000 index 0000000..7b4b386 --- /dev/null +++ b/systemd/system/dbus-fi.w1.wpa_supplicant1.service @@ -0,0 +1 @@ +/lib/systemd/system/wpa_supplicant.service \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/wpa_supplicant.service b/systemd/system/multi-user.target.wants/wpa_supplicant.service new file mode 120000 index 0000000..7b4b386 --- /dev/null +++ b/systemd/system/multi-user.target.wants/wpa_supplicant.service @@ -0,0 +1 @@ +/lib/systemd/system/wpa_supplicant.service \ No newline at end of file diff --git a/wpa_supplicant/functions.sh b/wpa_supplicant/functions.sh index 67ac946..26404e7 100755 --- a/wpa_supplicant/functions.sh +++ b/wpa_supplicant/functions.sh @@ -931,10 +931,8 @@ ifup () { fi if [ -n "$WPA_LOGICAL_IFACE" ]; then - if egrep -q "^iface[[:space:]]+${WPA_LOGICAL_IFACE}[[:space:]]+inet" "$INTERFACES_FILE"; then - : # logical network is defined - else - wpa_msg log "network settings not defined for $WPA_LOGICAL_IFACE in $INTERFACES_FILE" + if ! /sbin/ifquery "${WPA_LOGICAL_IFACE}" > /dev/null 2>&1; then + wpa_msg log "network settings not defined for $WPA_LOGICAL_IFACE in $INTERFACES_FILE and included files." WPA_LOGICAL_IFACE="default" fi -- 2.39.5