committing changes in /etc after apt run

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

Mon, 7 May 2018 21:52:42 +0000 (23:52 +0200)

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

Mon, 7 May 2018 21:52:42 +0000 (23:52 +0200)
author Frank Brehm <frank@brehm-online.com>
Mon, 7 May 2018 21:52:42 +0000 (23:52 +0200)
committer Frank Brehm <frank@brehm-online.com>
Mon, 7 May 2018 21:52:42 +0000 (23:52 +0200)
diff --git a/NetworkManager/dispatcher.d/20-chrony b/NetworkManager/dispatcher.d/20-chrony

index 51d7fa2588b68aef70626890126d2aaad3332c19..a609a66f5bc9acbbfe59ee81a449d3c809ef57dc 100755 (executable)
--- a/NetworkManager/dispatcher.d/20-chrony
+++ b/NetworkManager/dispatcher.d/20-chrony
@@ -4,6 +4,8 @@
  
  export LC_ALL=C
  
+[ "$2" != "up" ] && [ "$2" != "down" ] && exit 0
+
  # Check if there is a default route
  
  if /sbin/ip route list 2> /dev/null | grep -q '^default'; then
diff --git a/apparmor.d/usr.bin.man b/apparmor.d/usr.bin.man

index d604a9cbe5f386768577c53f20fc6c9d1988d9c6..173807955efcf36107c74a6bbf6271959059d6cc 100644 (file)
--- a/apparmor.d/usr.bin.man
+++ b/apparmor.d/usr.bin.man
@@ -38,6 +38,9 @@
    capability setuid,
    capability setgid,
  
+  signal peer=man_groff,
+  signal peer=man_filter,
+
    # Site-specific additions and overrides.  See local/README for details.
    #include <local/usr.bin.man>
  }
@@ -63,6 +66,8 @@ profile man_groff {
    /etc/groff/** r,
    /usr/lib/groff/site-tmac/** r,
    /usr/share/groff/** r,
+
+  signal peer=/usr/bin/man,
  }
  
  profile man_filter {
@@ -80,4 +85,11 @@ profile man_filter {
    /usr/bin/lzip.lzip rm,
    /usr/bin/tr rm,
    /usr/bin/xz rm,
+
+  # Manual pages can be more or less anywhere, especially with "man -l", and
+  # there's no harm in allowing wide read access here since the worst it can
+  # do is feed data to the invoking man process.
+  /** r,
+
+  signal peer=/usr/bin/man,
  }
diff --git a/apparmor.d/usr.sbin.chronyd b/apparmor.d/usr.sbin.chronyd

index 7a6b53b4e5c9183bac5853291456de46f9112364..b664ad03ead81e7981394f3c00e14732e6c5fcc0 100644 (file)
--- a/apparmor.d/usr.sbin.chronyd
+++ b/apparmor.d/usr.sbin.chronyd
@@ -14,6 +14,8 @@
    capability sys_resource,
    # for /run/chrony to be created
    capability chown,
+  # Needed to support HW timestamping
+  capability net_admin,
  
    /usr/sbin/chronyd mr,
  
diff --git a/apt/apt.conf.d/01autoremove b/apt/apt.conf.d/01autoremove

index 7031df5578f10fa5229c112cce6ad104449d3b93..6c6767bb910130c9198c21e779549fc64d2a2458 100644 (file)
--- a/apt/apt.conf.d/01autoremove
+++ b/apt/apt.conf.d/01autoremove
@@ -12,6 +12,8 @@ APT
         "linux-image";
         "linux-headers";
         "linux-image-extra";
+       "linux-modules";
+       "linux-modules-extra";
         "linux-signed-image";
         # kfreebsd kernels
         "kfreebsd-image";
@@ -22,6 +24,7 @@ APT
         ".*-modules";
         ".*-kernel";
         "linux-backports-modules-.*";
+       "linux-modules-.*";
          # tools
          "linux-tools";
          "linux-cloud-tools";
diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels

index f4d938a15f161974e23f4b29b74fb17dcd82a346..5e00c22d9c21840c8713e0d9404bf8fa153b278f 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -1,55 +1,61 @@
  // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal
  APT::NeverAutoRemove
  {
-   "^linux-image-4\.14\.0-3-amd64$";
     "^linux-image-4\.15\.0-2-amd64$";
-   "^linux-headers-4\.14\.0-3-amd64$";
+   "^linux-image-4\.16\.0-1-amd64$";
     "^linux-headers-4\.15\.0-2-amd64$";
-   "^linux-image-extra-4\.14\.0-3-amd64$";
+   "^linux-headers-4\.16\.0-1-amd64$";
     "^linux-image-extra-4\.15\.0-2-amd64$";
-   "^linux-signed-image-4\.14\.0-3-amd64$";
+   "^linux-image-extra-4\.16\.0-1-amd64$";
+   "^linux-modules-4\.15\.0-2-amd64$";
+   "^linux-modules-4\.16\.0-1-amd64$";
+   "^linux-modules-extra-4\.15\.0-2-amd64$";
+   "^linux-modules-extra-4\.16\.0-1-amd64$";
     "^linux-signed-image-4\.15\.0-2-amd64$";
-   "^kfreebsd-image-4\.14\.0-3-amd64$";
+   "^linux-signed-image-4\.16\.0-1-amd64$";
     "^kfreebsd-image-4\.15\.0-2-amd64$";
-   "^kfreebsd-headers-4\.14\.0-3-amd64$";
+   "^kfreebsd-image-4\.16\.0-1-amd64$";
     "^kfreebsd-headers-4\.15\.0-2-amd64$";
-   "^gnumach-image-4\.14\.0-3-amd64$";
+   "^kfreebsd-headers-4\.16\.0-1-amd64$";
     "^gnumach-image-4\.15\.0-2-amd64$";
-   "^.*-modules-4\.14\.0-3-amd64$";
+   "^gnumach-image-4\.16\.0-1-amd64$";
     "^.*-modules-4\.15\.0-2-amd64$";
-   "^.*-kernel-4\.14\.0-3-amd64$";
+   "^.*-modules-4\.16\.0-1-amd64$";
     "^.*-kernel-4\.15\.0-2-amd64$";
-   "^linux-backports-modules-.*-4\.14\.0-3-amd64$";
+   "^.*-kernel-4\.16\.0-1-amd64$";
     "^linux-backports-modules-.*-4\.15\.0-2-amd64$";
-   "^linux-tools-4\.14\.0-3-amd64$";
+   "^linux-backports-modules-.*-4\.16\.0-1-amd64$";
+   "^linux-modules-.*-4\.15\.0-2-amd64$";
+   "^linux-modules-.*-4\.16\.0-1-amd64$";
     "^linux-tools-4\.15\.0-2-amd64$";
-   "^linux-cloud-tools-4\.14\.0-3-amd64$";
+   "^linux-tools-4\.16\.0-1-amd64$";
     "^linux-cloud-tools-4\.15\.0-2-amd64$";
+   "^linux-cloud-tools-4\.16\.0-1-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.14.0-2-amd64                4.14.7-1                       amd64        Linux 4.14 for 64-bit PCs
  ii  linux-image-4.14.0-3-amd64                4.14.17-1                      amd64        Linux 4.14 for 64-bit PCs
-iF  linux-image-4.15.0-2-amd64                4.15.11-1                      amd64        Linux 4.15 for 64-bit PCs
+ii  linux-image-4.15.0-2-amd64                4.15.11-1                      amd64        Linux 4.15 for 64-bit PCs
+iF  linux-image-4.16.0-1-amd64                4.16.5-1                       amd64        Linux 4.16 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.15+91                        amd64        Linux for 64-bit PCs (meta-package)
+iU  linux-image-amd64                         4.16+93                        amd64        Linux for 64-bit PCs (meta-package)
  # list of installed kernel packages:
-4.14.0-2-amd64 4.14.7-1
  4.14.0-3-amd64 4.14.17-1
  4.15.0-2-amd64 4.15.11-1
+4.16.0-1-amd64 4.16.5-1
  # list of different kernel versions:
+4.16.5-1
  4.15.11-1
  4.14.17-1
-4.14.7-1
-# Installing kernel: 4.15.11-1 (4.15.0-2-amd64)
-# Running kernel: 4.14.17-1 (4.14.0-3-amd64)
-# Last kernel: 4.15.11-1
-# Previous kernel: 4.14.17-1
+# Installing kernel: 4.16.5-1 (4.16.0-1-amd64)
+# Running kernel: 4.15.11-1 (4.15.0-2-amd64)
+# Last kernel: 4.16.5-1
+# Previous kernel: 4.15.11-1
  # Kernel versions list to keep:
-4.14.17-1
  4.15.11-1
+4.16.5-1
  # Kernel packages (version part) to protect:
-4\.14\.0-3-amd64
  4\.15\.0-2-amd64
+4\.16\.0-1-amd64
  */
diff --git a/init.d/procps b/init.d/procps

index b1757105cdcdee1a12dcf51ce93d837e13c516da..4d7f4ceb832127cf96e8f2576ff889ac26562432 100755 (executable)
--- a/init.d/procps
+++ b/init.d/procps
@@ -1,8 +1,8 @@
  #! /bin/sh
-# /etc/init.d/procps: Set kernel variables from /etc/sysctl.conf
-#
-# written by Elrond <Elrond@Wunder-Nett.org>
-
+# kFreeBSD do not accept scripts as interpreters, using #!/bin/sh and sourcing.
+if [ true != "$INIT_D_SCRIPT_SOURCED" ] ; then
+    set "$0" "$@"; INIT_D_SCRIPT_SOURCED=true . /lib/init/init-d-script
+fi
  ### BEGIN INIT INFO
  # Provides:          procps
  # Required-Start:    mountkernfs $local_fs
@@ -14,41 +14,21 @@
  # Short-Description: Configure kernel parameters at boottime
  # Description:  Loads kernel parameters that are specified in /etc/sysctl.conf
  ### END INIT INFO
+#
+# written by Elrond <Elrond@Wunder-Nett.org>
  
-PATH=/sbin:/bin
-
-SYSCTL=/sbin/sysctl
-
-test -x $SYSCTL || exit 0
-
-. /lib/lsb/init-functions
+DESC="Setting kernel variables"
+DAEMON=/sbin/sysctl
+PIDFILE=none
  
  # Comment this out for sysctl to print every item changed
  QUIET_SYSCTL="-q"
  
-# Check for existance of the default file and exit if not there,
-# Closes #52839 for the boot-floppy people
-if [ -f /etc/default/rcS ] ; then
-  . /etc/default/rcS
-fi
-
-set -e
-
-case "$1" in
-       start|restart|force-reload|reload)
-               log_action_begin_msg "Setting kernel variables"
-               STATUS=0
-               $SYSCTL $QUIET_SYSCTL --system || STATUS=$?
-               log_action_end_msg $STATUS
-               ;;
-       stop)
-               ;;
-    status)
-        ;;
-       *)
-               echo "Usage: /etc/init.d/procps {start|stop|restart|reload|force-reload|status}" >&2
-               exit 3
-               ;;
-esac
+do_start_cmd() {
+       STATUS=0
+       $DAEMON $QUIET_SYSCTL --system || STATUS=$?
+       return $STATUS
+}
  
-exit 0
+do_stop() { return 0; }
+do_status() { return 0; }
diff --git a/sysctl.conf b/sysctl.conf

index ad735929c8d88072b5100ee6256980b28db43149..bd112aafe3d979b9dfadbf2a1f213831cb30927d 100644 (file)
--- a/sysctl.conf
+++ b/sysctl.conf
@@ -62,11 +62,6 @@
  ###################################################################
  # Magic system request Key
  # 0=disable, 1=enable all, >1 bitmask of sysrq functions
-# Debian kernels have this set to 438 which is the OR of:
-#  64 = enable signalling of processes
-#  128 = allow reboot/poweroff
-#  256 = allow nicing of all RT tasks
-#
  # See https://www.kernel.org/doc/html/latest/admin-guide/sysrq.html
  # for what other values do
  #kernel.sysrq=438
author	Frank Brehm <frank@brehm-online.com>
	Mon, 7 May 2018 21:52:42 +0000 (23:52 +0200)
committer	Frank Brehm <frank@brehm-online.com>
	Mon, 7 May 2018 21:52:42 +0000 (23:52 +0200)
NetworkManager/dispatcher.d/20-chrony		patch \| blob \| history
apparmor.d/usr.bin.man		patch \| blob \| history
apparmor.d/usr.sbin.chronyd		patch \| blob \| history
apt/apt.conf.d/01autoremove		patch \| blob \| history
apt/apt.conf.d/01autoremove-kernels		patch \| blob \| history
init.d/procps		patch \| blob \| history
sysctl.conf		patch \| blob \| history