From: Frank Brehm Date: Tue, 24 Jan 2017 10:28:18 +0000 (+0100) Subject: committing changes in /etc after apt run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=d29663a0dbad14402dc5cad3aa024d8dcb0ed86f;p=config%2Flena%2Fetc.git committing changes in /etc after apt run Package changes: -base-files 9.7 amd64 +base-files 9.8 amd64 -bzip2 1.0.6-8 amd64 +bzip2 1.0.6-8+b1 amd64 -dh-autoreconf 12 all +dh-autoreconf 13 all -diffutils 1:3.5-1 amd64 +diffutils 1:3.5-3 amd64 -dput 0.11.0 all +dput 0.12.0 all -geoip-database 20161219-1 all +geoip-database 20170111-1 all -ifupdown 0.8.16 amd64 +ifupdown 0.8.18 amd64 -libapparmor1 2.10.95-8 amd64 +libapparmor1 2.11.0-1 amd64 -libbz2-1.0 1.0.6-8 amd64 +libbz2-1.0 1.0.6-8+b1 amd64 -libcurl3-gnutls 7.51.0-1 amd64 +libcurl3-gnutls 7.52.1-1 amd64 -libgnutls-openssl27 3.5.7-3 amd64 -libgnutls30 3.5.7-3 amd64 +libgnutls-openssl27 3.5.8-1 amd64 +libgnutls30 3.5.8-1 amd64 +libidn2-0 0.14-1 amd64 -libio-socket-ssl-perl 2.040-1 all +libio-socket-ssl-perl 2.043-1 all -libldap-2.4-2 2.4.44+dfsg-2 amd64 -libldap-common 2.4.44+dfsg-2 all +libldap-2.4-2 2.4.44+dfsg-3 amd64 +libldap-common 2.4.44+dfsg-3 all -libnet-http-perl 6.09-1 all +libnet-http-perl 6.12-1 all -libnet-ssleay-perl 1.78-1+b1 amd64 +libnet-ssleay-perl 1.80-1 amd64 -libpng16-16 1.6.26-6 amd64 +libpng16-16 1.6.28-1 amd64 -libsqlite3-0 3.15.2-2 amd64 +libsqlite3-0 3.16.2-1 amd64 -libssl1.0.2 1.0.2j-4 amd64 +libssl1.0.2 1.0.2j-5 amd64 -libtry-tiny-perl 0.27-1 all +libtry-tiny-perl 0.28-1 all -login 1:4.2-3.3 amd64 -logrotate 3.8.7-2 amd64 +login 1:4.4-1 amd64 +logrotate 3.11.0-0.1 amd64 -nano 2.7.3-1 amd64 +nano 2.7.4-1 amd64 -passwd 1:4.2-3.3 amd64 +passwd 1:4.4-1 amd64 +perl-openssl-defaults 2 amd64 +python-gpg 1.8.0-3 amd64 -python-pkg-resources 32.0.0-1 all +python-pkg-resources 32.3.1-1 all -python-pysimplesoap 1.16-1 all +python-pysimplesoap 1.16-2 all -python-setuptools 32.0.0-1 all +python-setuptools 32.3.1-1 all -python3-pkg-resources 32.0.0-1 all +python3-pkg-resources 32.3.1-1 all -python3-pysimplesoap 1.16-1 all +python3-pysimplesoap 1.16-2 all -python3-setuptools 32.0.0-1 all +python3-setuptools 32.3.1-1 all -schroot 1.6.10-2+b2 amd64 -schroot-common 1.6.10-2 all +schroot 1.6.10-3 amd64 +schroot-common 1.6.10-3 all -sed 4.2.2-8 amd64 +sed 4.3-3 amd64 -sudo 1.8.19-1 amd64 -swaks 20130209.0-5 all +sudo 1.8.19p1-1 amd64 +swaks 20170101.0-1 all -wdiff 1.2.2-1+b1 amd64 +wdiff 1.2.2-2 amd64 -zsh 5.3.1-1 amd64 -zsh-common 5.3.1-1 all +zsh 5.3.1-2 amd64 +zsh-common 5.3.1-2 all --- diff --git a/.etckeeper b/.etckeeper index b53a552..5cf4bef 100755 --- a/.etckeeper +++ b/.etckeeper @@ -97,7 +97,6 @@ maybe chmod 0755 'bash_completion.d' maybe chmod 0644 'bash_completion.d/dlocate-completion' maybe chmod 0644 'bash_completion.d/git-prompt' maybe chmod 0644 'bash_completion.d/grub' -maybe chmod 0644 'bash_completion.d/schroot' maybe chmod 0644 'bindresvport.blacklist' maybe chmod 0755 'binfmt.d' maybe chmod 0755 'byobu' diff --git a/bash_completion.d/schroot b/bash_completion.d/schroot deleted file mode 100644 index 3048926..0000000 --- a/bash_completion.d/schroot +++ /dev/null @@ -1,37 +0,0 @@ -# Debian GNU/Linux schroot(1) completion. -# Copyright © 2009 Tim Abbott -# -# schroot is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# schroot is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# . - -have schroot && -_schroot() -{ - local cur prev options - - COMPREPLY=() - _get_comp_words_by_ref -n : cur prev - - # Select precisely the tokens from schroot --help that begin with a dash - options=$(schroot --help | sed 's/\(^\|[[:space:]]\)[^[:space:]-][^[:space:]]*//g') - - if [ "$prev" = "-c" ] || [ "$prev" = "--chroot" ]; then - COMPREPLY=( $(compgen -W "$(schroot -a -l)" -- $cur) ) - __ltrim_colon_completions "$cur" - else - COMPREPLY=( $(compgen -W "$options" -- $cur) ) - fi - return 0 -} -complete -F _schroot schroot diff --git a/debian_version b/debian_version index b0b57ed..dd98ee6 100644 --- a/debian_version +++ b/debian_version @@ -1 +1 @@ -stretch/sid +9.0 diff --git a/issue b/issue index d6e11b9..0a0a7e7 100644 --- a/issue +++ b/issue @@ -1,2 +1,2 @@ -Debian GNU/Linux stretch/sid \n \l +Debian GNU/Linux 9 \n \l diff --git a/issue.net b/issue.net index cd026d9..a88f8d4 100644 --- a/issue.net +++ b/issue.net @@ -1 +1 @@ -Debian GNU/Linux stretch/sid +Debian GNU/Linux 9 diff --git a/schroot/setup.d/10mount b/schroot/setup.d/10mount index 04757c3..296a162 100755 --- a/schroot/setup.d/10mount +++ b/schroot/setup.d/10mount @@ -93,12 +93,15 @@ do_umount_all() ( flock 9 mounts="$("$LIBEXEC_DIR/schroot-listmounts" -m "$1")" + anyfailed="" if [ "x$mounts" != 'x' ]; then echo "$mounts" | while read mountloc; do info "Unmounting $mountloc" - umount "$mountloc" || exit 1 - done || exit 1 + umount "$mountloc" || anyfailed="yes" + done + + [ -z "$anyfailed" ] || exit 1 fi ) 9>"/var/lock/schroot/umount" else diff --git a/schroot/setup.d/15killprocs b/schroot/setup.d/15killprocs index 8630e89..a37c455 100755 --- a/schroot/setup.d/15killprocs +++ b/schroot/setup.d/15killprocs @@ -39,6 +39,7 @@ kill_proc() # $1: mount base location do_kill_all() { + chroot_path=$(realpath "$1") if [ -z "$1" ]; then fatal "No path for finding stray processes: not reaping processes in chroot" fi @@ -48,11 +49,11 @@ do_kill_all() while read pid; do # Check if process root are the same device/inode as chroot # root (for efficiency) - if [ /proc/"$pid"/root -ef "$1" ]; then + if [ /proc/"$pid"/root -ef "$chroot_path" ]; then # Check if process and chroot root are the same (may be # different even if device/inode match). - root=$(readlink /proc/"$pid"/root || true) - if [ "$root" = "$1" ]; then + root=$(readlink --canonicalize /proc/"$pid"/root || true) + if [ "$root" = "$chroot_path" ]; then exe=$(readlink /proc/"$pid"/exe || true) info "Killing left-over pid $pid (${exe##$1})" info " Sending SIGTERM to pid $pid"