committing changes in /etc after apt run

Package changes:
-byobu 5.87-1 all
+byobu 5.112-1 all
-chrony 2.4-1 amd64
+chrony 2.4.1-1 amd64
-dirmngr 2.1.15-9 amd64
+dirmngr 2.1.16-2 amd64
-gnupg 2.1.15-9 amd64
-gnupg-agent 2.1.15-9 amd64
-gnupg-l10n 2.1.15-9 all
-gpgv 2.1.15-9 amd64
+gnupg 2.1.16-2 amd64
+gnupg-agent 2.1.16-2 amd64
+gnupg-l10n 2.1.16-2 all
+gpgv 2.1.16-2 amd64
-libcgi-fast-perl 1:2.10-1 all
+libcgi-fast-perl 1:2.11-1 all
-libedit2 3.1-20160903-1 amd64
+libedit2 3.1-20160903-2 amd64
-libhtml-parser-perl 3.72-2+b1 amd64
+libhtml-parser-perl 3.72-3 amd64
-libio-socket-ssl-perl 2.038-1 all
+libio-socket-ssl-perl 2.039-1 all
-libpam-systemd 232-3 amd64
+libpam-systemd 232-6 amd64
-libpath-tiny-perl 0.096-1 all
+libpath-tiny-perl 0.098-1 all
-libsystemd0 232-3 amd64
+libsystemd0 232-6 amd64
-libudev1 232-3 amd64
+libudev1 232-6 amd64
-libyaml-perl 1.18-1 all
+libyaml-perl 1.19-1 all
-man-db 2.7.5-1 amd64
+man-db 2.7.5-2 amd64
-manpages-de 1.16-1 all
+manpages-de 1.17-1 all
-systemd 232-3 amd64
-systemd-sysv 232-3 amd64
+systemd 232-6 amd64
+systemd-sysv 232-6 amd64
-udev 232-3 amd64
+udev 232-6 amd64

diff --git a/.etckeeper b/.etckeeper
index 7ea8aecb7073b499b0eef02d120cc51c40b38942..3cc1d73d06aa098852f751e1cceecf314bf57959 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -189,6 +189,7 @@ maybe chmod 0644 'debconf.conf'
 maybe chmod 0644 'debian_version'
 maybe chmod 0755 'default'
 maybe chmod 0644 'default/bsdmainutils'
+maybe chmod 0644 'default/chrony'
 maybe chmod 0644 'default/console-setup'
 maybe chmod 0644 'default/cron'
 maybe chmod 0644 'default/dbus'

diff --git a/default/chrony b/default/chrony
new file mode 100644 (file)
index 0000000..929dea0
--- /dev/null
+++ b/default/chrony
@@ -0,0 +1,5 @@
+# This is a configuration file for /etc/init.d/chrony; it allows you to
+# pass various options to the chrony daemon without editing the init script.
+
+# Options to pass to chrony.
+DAEMON_OPTS=""

diff --git a/init.d/chrony b/init.d/chrony
index 464d03dba00d92ec9b8a491524695548aebdbe37..f6cdc95fa9dee511ec21fe5a29e77d06c07dd38f 100755 (executable)
--- a/init.d/chrony
+++ b/init.d/chrony
@@ -27,6 +27,12 @@ DESC="time daemon"
 
 . /lib/lsb/init-functions
 
+# Override this variable by editing /etc/default/chrony.
+DAEMON_OPTS=""
+if [ -f /etc/default/chrony ]; then
+    . /etc/default/chrony
+fi
+
 putonline ()
 {   # Do we have a default route?  If so put chronyd online.
     if ip r 2>/dev/null | grep -q '^default'; then
@@ -45,7 +51,7 @@ putonline ()
 
 case "$1" in
     start)
-       start-stop-daemon --start --verbose --exec $DAEMON
+       start-stop-daemon --start --verbose --exec $DAEMON -- $DAEMON_OPTS
        case "$?" in
                0) # daemon successfully started
                        putonline
@@ -66,7 +72,7 @@ case "$1" in
        echo -n "Restarting $DESC: "
        start-stop-daemon --stop --quiet --exec $DAEMON
        sleep 1
-       start-stop-daemon --start --verbose --exec $DAEMON -- -r
+       start-stop-daemon --start --verbose --exec $DAEMON -- -r $DAEMON_OPTS
        case "$?" in
                0) # daemon successfully started
                        putonline

diff --git a/manpath.config b/manpath.config
index bab962423be4b3e886175f1ee418fe33152cb206..722a52d614896ecd5d00a7f5c2149d3bdf8add87 100644 (file)
--- a/manpath.config
+++ b/manpath.config
@@ -108,7 +108,7 @@ MANDB_MAP   /opt/man                /var/cache/man/opt
 # particular order. Sections with extensions should usually be adjacent to
 # their main section (e.g. "1 1mh 8 ...").
 #
-SECTION                1 n l 8 3 2 3posix 3pm 3perl 5 4 9 6 7
+SECTION                1 n l 8 3 2 3posix 3pm 3perl 3am 5 4 9 6 7
 #
 #---------------------------------------------------------
 # Range of terminal widths permitted when displaying cat pages. If the

diff --git a/profile.d/Z97-byobu.sh b/profile.d/Z97-byobu.sh
index cfb003eee320ed86b2851c35dfbe1f03cd54c762..51b2887786bc78074c8e2ef43641abe4258ad9b1 100644 (file)
--- a/profile.d/Z97-byobu.sh
+++ b/profile.d/Z97-byobu.sh
@@ -1,7 +1,7 @@
 #    Z97-byobu.sh - allow any user to opt into auto-launching byobu
 #    Copyright (C) 2011 Canonical Ltd.
 #
-#    Authors: Dustin Kirkland <kirkland@byobu.co>
+#    Authors: Dustin Kirkland <kirkland@byobu.org>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -19,16 +19,23 @@
 # Apologies for borrowing the LC_BYOBU namespace, but:
 #  a) it's reasonable to assume that no one else is using LC_BYOBU
 #  b) LC_* is sent and receieved by most /etc/ssh/ssh*_config
-if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ] && [ -r "/usr/bin/byobu-launch" ]; then
-       . /usr/bin/byobu-launch
-elif [ "$LC_TERMTYPE" = "byobu" ] && [ -r "/usr/bin/byobu-launch" ]; then
-       . /usr/bin/byobu-launch
-elif [ "$LC_TERMTYPE" = "byobu-screen" ] && [ -r "/usr/bin/byobu-launch" ]; then
-       export BYOBU_BACKEND="screen"
-       . /usr/bin/byobu-launch
-elif [ "$LC_TERMTYPE" = "byobu-tmux" ] && [ -r "/usr/bin/byobu-launch" ]; then
-       export BYOBU_BACKEND="tmux"
-       . /usr/bin/byobu-launch
+
+if [ -r "/usr/bin/byobu-launch" ]; then
+       if [ "$LC_BYOBU" = "0" ]; then
+               true
+       elif [ "$LC_BYOBU" = "1" ]; then
+               . /usr/bin/byobu-launch
+       elif [ -e "/etc/byobu/autolaunch" ]; then
+               . /usr/bin/byobu-launch
+       elif [ "$LC_TERMTYPE" = "byobu" ]; then
+               . /usr/bin/byobu-launch
+       elif [ "$LC_TERMTYPE" = "byobu-screen" ]; then
+               export BYOBU_BACKEND="screen"
+               . /usr/bin/byobu-launch
+       elif [ "$LC_TERMTYPE" = "byobu-tmux" ]; then
+               export BYOBU_BACKEND="tmux"
+               . /usr/bin/byobu-launch
+       fi
 fi
 
 # vi: syntax=sh ts=4 noexpandtab

diff --git a/systemd/system/ctrl-alt-del.target b/systemd/system/ctrl-alt-del.target
deleted file mode 120000 (symlink)
index 2e22770..0000000
--- a/systemd/system/ctrl-alt-del.target
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/reboot.target
\ No newline at end of file