committing changes in /etc after apt run

author Frank Brehm <frank@brehm-online.com>

Thu, 25 Oct 2018 16:34:05 +0000 (18:34 +0200)

committer Frank Brehm <frank@brehm-online.com>

Thu, 25 Oct 2018 16:34:05 +0000 (18:34 +0200)
author Frank Brehm <frank@brehm-online.com>
Thu, 25 Oct 2018 16:34:05 +0000 (18:34 +0200)
committer Frank Brehm <frank@brehm-online.com>
Thu, 25 Oct 2018 16:34:05 +0000 (18:34 +0200)
diff --git a/.etckeeper b/.etckeeper

index bef2d86e1abfc4db66ca7b22c4193303d145571d..9995eda6f78da5383e09a975ab30cc7d7d622e4d 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -482,8 +482,6 @@ maybe chmod 0755 'network/if-up.d/openssh-server'
  maybe chmod 0644 'network/interfaces'
  maybe chmod 0755 'network/interfaces.d'
  maybe chmod 0644 'networks'
-maybe chmod 0755 'newt'
-maybe chmod 0644 'newt/palette.original'
  maybe chmod 0644 'nsswitch.conf'
  maybe chmod 0755 'opt'
  maybe chmod 0644 'pam.conf'
@@ -562,6 +560,8 @@ maybe chmod 0644 'python2.7/sitecustomize.py'
  maybe chmod 0755 'python3'
  maybe chmod 0755 'python3.6'
  maybe chmod 0644 'python3.6/sitecustomize.py'
+maybe chmod 0755 'python3.7'
+maybe chmod 0644 'python3.7/sitecustomize.py'
  maybe chmod 0644 'python3/debian_config'
  maybe chmod 0755 'rc0.d'
  maybe chmod 0755 'rc1.d'
diff --git a/NetworkManager/dispatcher.d/20-chrony b/NetworkManager/dispatcher.d/20-chrony

index a609a66f5bc9acbbfe59ee81a449d3c809ef57dc..0b0c3e7103e5254212d5bb1d98eea4e0ca159701 100755 (executable)
--- a/NetworkManager/dispatcher.d/20-chrony
+++ b/NetworkManager/dispatcher.d/20-chrony
@@ -1,37 +1,15 @@
  #!/bin/sh
-# This is a NetworkManager dispatcher script for chronyd to set its NTP sources
-# online or offline when a network interface is configured or removed
+# This is a NetworkManager dispatcher / networkd-dispatcher script for
+# chronyd to set its NTP sources online or offline when a network interface
+# is configured or removed
  
  export LC_ALL=C
  
-[ "$2" != "up" ] && [ "$2" != "down" ] && exit 0
+# For NetworkManager consider only up/down events
+[ $# -ge 2 ] && [ "$2" != "up" ] && [ "$2" != "down" ] && exit 0
  
-# Check if there is a default route
+# Note: for networkd-dispatcher routable.d ~= on and off.d ~= off
  
-if /sbin/ip route list 2> /dev/null | grep -q '^default'; then
-  chronyc online > /dev/null 2>&1
-  exit 0
-fi
-
-sources=$(chronyc -c -n sources 2> /dev/null)
-
-[ $? -ne 0 ] && exit 0
-
-# Check each configured source if it has a route
-
-echo "$sources" | while IFS=, read mode state address rest; do
-  [ "$mode" != '^' ] && [ "$mode" != '=' ] && continue
-
-  /sbin/ip route get "$address" > /dev/null 2>&1 && command="online" || command="offline"
-
-  # Set priority of sources so that the selected source is set as
-  # last if offline to avoid unnecessary reselection
-  [ "$state" != '*' ] && priority=1 || priority=2
-
-  echo "$priority $command $address"
-
-done | sort | while read priority command address; do
-  echo "$command $address"
-done | chronyc > /dev/null 2>&1
+chronyc onoffline > /dev/null 2>&1
  
  exit 0
diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels

index c6da00f07ad52c43c592b52ae66215d93961f7f9..17e7773459627edc139f867ff7c62226b97701e1 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -1,61 +1,61 @@
  // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal
  APT::NeverAutoRemove
  {
-   "^linux-image-4\.17\.0-3-amd64$";
     "^linux-image-4\.18\.0-1-amd64$";
-   "^linux-headers-4\.17\.0-3-amd64$";
+   "^linux-image-4\.18\.0-2-amd64$";
     "^linux-headers-4\.18\.0-1-amd64$";
-   "^linux-image-extra-4\.17\.0-3-amd64$";
+   "^linux-headers-4\.18\.0-2-amd64$";
     "^linux-image-extra-4\.18\.0-1-amd64$";
-   "^linux-modules-4\.17\.0-3-amd64$";
+   "^linux-image-extra-4\.18\.0-2-amd64$";
     "^linux-modules-4\.18\.0-1-amd64$";
-   "^linux-modules-extra-4\.17\.0-3-amd64$";
+   "^linux-modules-4\.18\.0-2-amd64$";
     "^linux-modules-extra-4\.18\.0-1-amd64$";
-   "^linux-signed-image-4\.17\.0-3-amd64$";
+   "^linux-modules-extra-4\.18\.0-2-amd64$";
     "^linux-signed-image-4\.18\.0-1-amd64$";
-   "^kfreebsd-image-4\.17\.0-3-amd64$";
+   "^linux-signed-image-4\.18\.0-2-amd64$";
     "^kfreebsd-image-4\.18\.0-1-amd64$";
-   "^kfreebsd-headers-4\.17\.0-3-amd64$";
+   "^kfreebsd-image-4\.18\.0-2-amd64$";
     "^kfreebsd-headers-4\.18\.0-1-amd64$";
-   "^gnumach-image-4\.17\.0-3-amd64$";
+   "^kfreebsd-headers-4\.18\.0-2-amd64$";
     "^gnumach-image-4\.18\.0-1-amd64$";
-   "^.*-modules-4\.17\.0-3-amd64$";
+   "^gnumach-image-4\.18\.0-2-amd64$";
     "^.*-modules-4\.18\.0-1-amd64$";
-   "^.*-kernel-4\.17\.0-3-amd64$";
+   "^.*-modules-4\.18\.0-2-amd64$";
     "^.*-kernel-4\.18\.0-1-amd64$";
-   "^linux-backports-modules-.*-4\.17\.0-3-amd64$";
+   "^.*-kernel-4\.18\.0-2-amd64$";
     "^linux-backports-modules-.*-4\.18\.0-1-amd64$";
-   "^linux-modules-.*-4\.17\.0-3-amd64$";
+   "^linux-backports-modules-.*-4\.18\.0-2-amd64$";
     "^linux-modules-.*-4\.18\.0-1-amd64$";
-   "^linux-tools-4\.17\.0-3-amd64$";
+   "^linux-modules-.*-4\.18\.0-2-amd64$";
     "^linux-tools-4\.18\.0-1-amd64$";
-   "^linux-cloud-tools-4\.17\.0-3-amd64$";
+   "^linux-tools-4\.18\.0-2-amd64$";
     "^linux-cloud-tools-4\.18\.0-1-amd64$";
+   "^linux-cloud-tools-4\.18\.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.16.0-2-amd64                4.16.16-2                    amd64        Linux 4.16 for 64-bit PCs
-ii  linux-image-4.17.0-3-amd64                4.17.17-1                    amd64        Linux 4.17 for 64-bit PCs
-iF  linux-image-4.18.0-1-amd64                4.18.6-1                     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+98                      amd64        Linux for 64-bit PCs (meta-package)
+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
+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)
  # list of installed kernel packages:
-4.16.0-2-amd64 4.16.16-2
  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
  # list of different kernel versions:
+4.18.10-2
  4.18.6-1
  4.17.17-1
-4.16.16-2
-# Installing kernel: 4.18.6-1 (4.18.0-1-amd64)
-# Running kernel: 4.17.17-1 (4.17.0-3-amd64)
-# Last kernel: 4.18.6-1
-# Previous kernel: 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
+# Previous kernel: 4.18.6-1
  # Kernel versions list to keep:
-4.17.17-1
+4.18.10-2
  4.18.6-1
  # Kernel packages (version part) to protect:
-4\.17\.0-3-amd64
  4\.18\.0-1-amd64
+4\.18\.0-2-amd64
  */
diff --git a/network/if-post-down.d/chrony b/network/if-post-down.d/chrony

index 1b2957712697db5773fdcc493f7159183d427877..2505e5a19ad29e675eea3c90977bf5403fd5ef8c 100755 (executable)
--- a/network/if-post-down.d/chrony
+++ b/network/if-post-down.d/chrony
@@ -4,8 +4,8 @@ set -e
  
  [ -x /usr/sbin/chronyd ] || exit 0
  
-if [ -e /run/chronyd.pid ] && ! ip r 2> /dev/null | grep -q '^default'; then
-    chronyc offline > /dev/null 2>&1
+if [ -e /run/chronyd.pid ]; then
+    chronyc onoffline > /dev/null 2>&1
  fi
  
  exit 0
diff --git a/network/if-up.d/chrony b/network/if-up.d/chrony

index 90622b81fb7fa9d41ab2322cd0ee2683cec75c71..2505e5a19ad29e675eea3c90977bf5403fd5ef8c 100755 (executable)
--- a/network/if-up.d/chrony
+++ b/network/if-up.d/chrony
@@ -4,9 +4,8 @@ set -e
  
  [ -x /usr/sbin/chronyd ] || exit 0
  
-if [ -e /run/chronyd.pid ] &&
-    ip r list dev $IFACE 2> /dev/null | grep -q '^default'; then
-    chronyc online > /dev/null 2>&1
+if [ -e /run/chronyd.pid ]; then
+    chronyc onoffline > /dev/null 2>&1
  fi
  
  exit 0
diff --git a/newt/palette.original b/newt/palette.original

deleted file mode 100644 (file)

index e69de29..0000000
diff --git a/ppp/ip-down.d/chrony b/ppp/ip-down.d/chrony

index c8b776bc14a2f47ad9eff2c423fe2ae221c901e6..da15be406da3bd27eca39c750375f542f86963ab 100755 (executable)
--- a/ppp/ip-down.d/chrony
+++ b/ppp/ip-down.d/chrony
@@ -6,8 +6,8 @@
  # were in the public domain.  I waive all rights.
  # Modified by Vincent Blut <vincent.debian@free.fr>
  
-if [ -e /run/chronyd.pid ] && ! ip r 2> /dev/null | grep -q '^default'; then
-    chronyc offline > /dev/null 2>&1
+if [ -e /run/chronyd.pid ]; then
+    chronyc onoffline > /dev/null 2>&1
  fi
  
  exit 0
diff --git a/ppp/ip-up.d/chrony b/ppp/ip-up.d/chrony

index d450452f00536898af093037c91713b5a62ffbcd..7bc92de52905b354067e4794fc174e09ae91c001 100755 (executable)
--- a/ppp/ip-up.d/chrony
+++ b/ppp/ip-up.d/chrony
@@ -5,8 +5,8 @@
  # were in the public domain.  I waive all rights.
  # Modified by Vincent Blut <vincent.debian@free.fr>
  
-if [ -e /run/chronyd.pid ] && ip r 2> /dev/null | grep -q '^default'; then
-    chronyc online > /dev/null 2>&1
+if [ -e /run/chronyd.pid ]; then
+    chronyc onoffline > /dev/null 2>&1
  fi
  
  exit 0
diff --git a/python3.7/sitecustomize.py b/python3.7/sitecustomize.py

new file mode 100644 (file)

index 0000000..89c6712
--- /dev/null
+++ b/python3.7/sitecustomize.py
@@ -0,0 +1,7 @@
+# install the apport exception handler if available
+try:
+    import apport_python_hook
+except ImportError:
+    pass
+else:
+    apport_python_hook.install()
author	Frank Brehm <frank@brehm-online.com>
	Thu, 25 Oct 2018 16:34:05 +0000 (18:34 +0200)
committer	Frank Brehm <frank@brehm-online.com>
	Thu, 25 Oct 2018 16:34:05 +0000 (18:34 +0200)
.etckeeper		patch \| blob \| history
NetworkManager/dispatcher.d/20-chrony		patch \| blob \| history
apt/apt.conf.d/01autoremove-kernels		patch \| blob \| history
network/if-post-down.d/chrony		patch \| blob \| history
network/if-up.d/chrony		patch \| blob \| history
newt/palette.original	[deleted file]	patch \| blob \| history
ppp/ip-down.d/chrony		patch \| blob \| history
ppp/ip-up.d/chrony		patch \| blob \| history
python3.7/sitecustomize.py	[new file with mode: 0644]	patch \| blob