committing changes in /etc after apt run

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

Tue, 24 Jan 2017 10:28:18 +0000 (11:28 +0100)

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

Tue, 24 Jan 2017 10:28:18 +0000 (11:28 +0100)
author Frank Brehm <frank@brehm-online.com>
Tue, 24 Jan 2017 10:28:18 +0000 (11:28 +0100)
committer Frank Brehm <frank@brehm-online.com>
Tue, 24 Jan 2017 10:28:18 +0000 (11:28 +0100)
diff --git a/.etckeeper b/.etckeeper

index b53a55242bcf0fe0910cc4b27a8edd82a9b6d7db..5cf4befebdd89bcb18d1f906c8d29891b722a8f3 100755 (executable)
--- 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 (file)

index 3048926..0000000
--- a/bash_completion.d/schroot
+++ /dev/null
@@ -1,37 +0,0 @@
-# Debian GNU/Linux schroot(1) completion.
-# Copyright © 2009 Tim Abbott <tabbott@mit.edu>
-#
-# 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
-# <http://www.gnu.org/licenses/>.
-
-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 b0b57ed4ac7e21bf42c78a783eb8ea3f8b65bc90..dd98ee6cb6411dcd240ba4a6b54d71c7f6da23c1 100644 (file)
--- a/debian_version
+++ b/debian_version
@@ -1 +1 @@
-stretch/sid
+9.0
diff --git a/issue b/issue

index d6e11b9966b907b267d58acf5bbceace5d62d8fa..0a0a7e7bbebc34511f62e5994d0fad323e9830a3 100644 (file)
--- 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 cd026d92b392df4bd3b7cadb69e7409c54b6d592..a88f8d46fb8487c10fd4d88d7a497230b31aa26b 100644 (file)
--- 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 04757c30e0df68158ba81cbb3a09fbecb9b8332b..296a16270b4ebd8f390f17651b8f440e0eb5c0fd 100755 (executable)
--- 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 8630e89a0280e8bf740b68e38514a41709b7cc44..a37c4555bcbecd06355743eb6cb188e7d49a3587 100755 (executable)
--- 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"
author	Frank Brehm <frank@brehm-online.com>
	Tue, 24 Jan 2017 10:28:18 +0000 (11:28 +0100)
committer	Frank Brehm <frank@brehm-online.com>
	Tue, 24 Jan 2017 10:28:18 +0000 (11:28 +0100)
.etckeeper		patch \| blob \| history
bash_completion.d/schroot	[deleted file]	patch \| blob \| history
debian_version		patch \| blob \| history
issue		patch \| blob \| history
issue.net		patch \| blob \| history
schroot/setup.d/10mount		patch \| blob \| history
schroot/setup.d/15killprocs		patch \| blob \| history