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 885A4138359 for ; Thu, 29 Oct 2020 16:14:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6C14E095C; Thu, 29 Oct 2020 16:14:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 5F893E0949 for ; Thu, 29 Oct 2020 16:14:29 +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 1E70F3408DD for ; Thu, 29 Oct 2020 16:14:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62A323BB for ; Thu, 29 Oct 2020 16:14:26 +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.a8a92a00b53e99b66b5c2bc9f44c2a3ba22ad454.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a8a92a00b53e99b66b5c2bc9f44c2a3ba22ad454 X-VCS-Branch: pending/mattst88 Date: Thu, 29 Oct 2020 16:14:26 +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: 02322469-f4bb-465d-a2a7-aba34c964827 X-Archives-Hash: b277776330e9d4100133756d7a42d558 commit: a8a92a00b53e99b66b5c2bc9f44c2a3ba22ad454 Author: Matt Turner gentoo org> AuthorDate: Sat May 16 21:44:37 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=a8a92a00 catalyst: Use libmount for handling mounts Handle the mounts/unmounts in all in process rather than shelling out (pun intended!) to an external program. While we're here, change some log.notice to log.debug since those cases are normal and expected. Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 57 ++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index e71ce344..73eacfbe 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -6,6 +6,7 @@ import sys from pathlib import Path +import libmount import toml from snakeoil import fileutils @@ -853,7 +854,8 @@ class StageBase(TargetBase, ClearBase, GenBase): source = str(self.mount[x]['source']) target = self.settings['chroot_path'] + str(self.mount[x]['target']) - mount = ['mount'] + fstype = '' + options = '' log.debug('bind %s: "%s" -> "%s"', x, source, target) @@ -861,18 +863,20 @@ class StageBase(TargetBase, ClearBase, GenBase): if 'var_tmpfs_portage' not in self.settings: continue - mount += ['-t', 'tmpfs', '-o', - f"size={self.settings['var_tmpfs_portage']}G"] + fstype = 'tmpfs' + options = f"size={self.settings['var_tmpfs_portage']}G" elif source == 'tmpfs': - mount += ['-t', 'tmpfs'] + fstype = 'tmpfs' elif source == 'shm': - mount += ['-t', 'tmpfs', '-o', 'noexec,nosuid,nodev'] + fstype = 'tmpfs' + options = 'noexec,nosuid,nodev' else: source_path = Path(self.mount[x]['source']) if source_path.suffix == '.sqfs': - mount += ['-o', 'ro'] + fstype = 'squashfs' + options = 'ro,loop' else: - mount.append('--bind') + options = 'bind' # We may need to create the source of the bind mount. E.g., in the # case of an empty package cache we must create the directory that @@ -881,38 +885,47 @@ class StageBase(TargetBase, ClearBase, GenBase): Path(target).mkdir(mode=0o755, parents=True, exist_ok=True) - cmd(mount + [source, target], env=self.env, fail_func=self.unbind) + try: + cxt = libmount.Context(source=source, target=target, + fstype=fstype, options=options) + cxt.mount() + except OSError as e: + self.unbind() + raise CatalystError(f"Couldn't mount: {source}, {e.strerror}") def unbind(self): - ouch = 0 - mypath = self.settings["chroot_path"] + chroot_path = self.settings["chroot_path"] + umount_failed = False # Unmount in reverse order - for x in [x for x in reversed(self.mount) if self.mount[x]['enable']]: - target = normpath(mypath + self.mount[x]['target']) - if not os.path.exists(target): - log.notice('%s does not exist. Skipping', target) + for target in [Path(chroot_path + self.mount[x]['target']) + for x in reversed(self.mount) + if self.mount[x]['enable']]: + if not target.exists(): + log.debug('%s does not exist. Skipping', target) continue if not ismount(target): - log.notice('%s is not a mount point. Skipping', target) + log.debug('%s is not a mount point. Skipping', target) continue try: - cmd(['umount', target], env=self.env) - except CatalystError: + 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: - cmd(['umount', target], env=self.env) - except CatalystError: - ouch = 1 - log.warning("Couldn't umount bind mount: %s", target) + cxt.umount() + except OSError as e: + umount_failed = True + log.warning("Couldn't umount: %s, %s", target, + e.strerror) - if ouch: + if umount_failed: # if any bind mounts really failed, then we need to raise # this to potentially prevent an upcoming bash stage cleanup script # from wiping our bind mounts.