From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E8DC2138359 for ; Thu, 29 Oct 2020 16:14:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BAB2E096F; Thu, 29 Oct 2020 16:14:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 17891E096F for ; Thu, 29 Oct 2020 16:14:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19BFE340E0D for ; Thu, 29 Oct 2020 16:14:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89EE73C7 for ; Thu, 29 Oct 2020 16:14:27 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1603988027.f948f1bd0665f98cd29e33b3da6f15c0b12435b2.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/, catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py targets/support/kill-chroot-pids.sh X-VCS-Directories: catalyst/base/ targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: f948f1bd0665f98cd29e33b3da6f15c0b12435b2 X-VCS-Branch: pending/mattst88 Date: Thu, 29 Oct 2020 16:14:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 394d748b-dd15-49bb-8352-5704f920b56d X-Archives-Hash: 63a486ff19103f7b939f5fd36f982732 commit: f948f1bd0665f98cd29e33b3da6f15c0b12435b2 Author: Matt Turner gentoo org> AuthorDate: Thu Oct 22 18:19:09 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Oct 29 16:13:47 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f948f1bd catalyst: Remove kill_support_pids() mount_namespaces(7) says A mount ceases to be a member of a peer group when either the mount is explicitly unmounted, or when the mount is implicitly unmounted because a mount namespace is removed (because it has no more member processes). Now that the build sequence is executed in its own mount namespace, the mounts are implicitly unmounted when the last process in the namespace dies, meaning we don't need to try any funny business around cleaning up processes in order to unmount. Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 30 +++--------------- targets/support/kill-chroot-pids.sh | 62 ------------------------------------- 2 files changed, 4 insertions(+), 88 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index ec9a8f06..5fc11eae 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -638,17 +638,6 @@ class StageBase(TargetBase, ClearBase, GenBase): assert self.settings[verify] == "blake2" self.settings.setdefault("gk_mainargs", []).append("--b2sum") - def kill_chroot_pids(self): - log.info('Checking for processes running in chroot and killing them.') - - # Force environment variables to be exported so script can see them - self.setup_environment() - - killcmd = normpath(self.settings["sharedir"] + - self.settings["shdir"] + "/support/kill-chroot-pids.sh") - if os.path.exists(killcmd): - cmd([killcmd], env=self.env) - def mount_safety_check(self): """ Check and verify that none of our paths in mypath are mounted. We don't @@ -920,18 +909,10 @@ class StageBase(TargetBase, ClearBase, GenBase): try: cxt = libmount.Context(target=str(target)) cxt.umount() - except OSError: - log.warning('First attempt to unmount failed: %s', target) - log.warning('Killing any pids still running in the chroot') - - self.kill_chroot_pids() - - try: - cxt.umount() - except OSError as e: - umount_failed = True - log.warning("Couldn't umount: %s, %s", target, - e.strerror) + except OSError as e: + log.warning("Couldn't umount: %s, %s", target, + e.strerror) + umount_failed = True if umount_failed: # if any bind mounts really failed, then we need to raise @@ -1382,9 +1363,6 @@ class StageBase(TargetBase, ClearBase, GenBase): def run(self): self.chroot_lock.write_lock() - # Kill any pids in the chroot - self.kill_chroot_pids() - # Check for mounts right away and abort if we cannot unmount them self.mount_safety_check() diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh deleted file mode 100755 index ea8ee402..00000000 --- a/targets/support/kill-chroot-pids.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -# Script to kill processes found running in the chroot. - -if [ "${clst_chroot_path}" == "/" ] -then - echo "Aborting .... clst_chroot_path is set to /" - echo "This is very dangerous" - exit 1 -fi - -if [ "${clst_chroot_path}" == "" ] -then - echo "Aborting .... clst_chroot_path is NOT set" - echo "This is very dangerous" - exit 1 -fi - -j=0 -declare -a pids -# Get files and dirs in /proc -for i in `ls /proc` -do - # Test for directories - if [ -d /proc/$i ] - then - # Search for exe containing string inside ${clst_chroot_path} - ls -la --color=never /proc/$i 2>&1 |grep exe|grep ${clst_chroot_path} > /dev/null - - # If found - if [ $? == 0 ] - then - # Assign the pid into the pids array - pids[$j]=$i - j=$(($j+1)) - fi - fi -done - -if [ ${j} -gt 0 ] -then - echo - echo "Killing process(es)" - echo "pid: process name" - for pid in ${pids[@]} - do - P_NAME=$(ls -la --color=never /proc/${pid} 2>&1 |grep exe|grep ${clst_chroot_path}|awk '{print $11}') - echo ${pid}: ${P_NAME} - done - echo - echo "Press Ctrl-C within 10 seconds to abort" - - sleep 10 - - for pid in ${pids[@]} - do - kill -9 ${pid} - done - - # Small sleep here to give the process(es) a chance to die before running unbind again. - sleep 5 - -fi