From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BD0B5138247 for ; Mon, 30 Dec 2013 01:44:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E45A0E0A49; Mon, 30 Dec 2013 01:44:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5937DE0A49 for ; Mon, 30 Dec 2013 01:44:51 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5499A33F793 for ; Mon, 30 Dec 2013 01:44:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B3CAEE5536 for ; Mon, 30 Dec 2013 01:44:48 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1388343246.ec491ccae1a8150e330b372992e0f497b559faac.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/generic_stage_target.py modules/stage1_target.py X-VCS-Directories: modules/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: ec491ccae1a8150e330b372992e0f497b559faac X-VCS-Branch: pending Date: Mon, 30 Dec 2013 01:44:48 +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-Archives-Salt: d09cfaef-bcbe-4408-a5d5-dbd9b6469c21 X-Archives-Hash: 88099fb5cdbd996620d970c5a2081e36 commit: ec491ccae1a8150e330b372992e0f497b559faac Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 17 06:22:05 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Dec 29 18:54:06 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ec491cca modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary Temporary location to define TARGET_MOUNTS, IT will be moved to a new defaults.py file in a later commit. I also plan to make them configurable. Cleans up all self.mounts, self.mountmap usage. Replace multiple path additions with one instance at the beginning of the function, reuse the result multiple times. Add some extra debug prints (to be converted to logging later) --- modules/generic_stage_target.py | 83 ++++++++++++++++++++++++++--------------- modules/stage1_target.py | 5 ++- 2 files changed, 55 insertions(+), 33 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 8f7654e..8d98e58 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -8,6 +8,20 @@ import catalyst_lock PORT_LOGDIR_CLEAN = \ 'find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +30 -delete' +TARGET_MOUNTS_DEFAULTS = { + "ccache": "/var/tmp/ccache", + "dev": "/dev", + "devpts": "/dev/pts", + "distdir": "/usr/portage/distfiles", + "icecream": "/usr/lib/icecc/bin", + "kerncache": "/tmp/kerncache", + "packagedir": "/usr/portage/packages", + "portdir": "/usr/portage", + "port_tmpdir": "/var/tmp/portage", + "port_logdir": "/var/log/portage", + "proc": "/proc", + } + class generic_stage_target(generic_target): """ @@ -178,6 +192,8 @@ class generic_stage_target(generic_target): file_locate(self.settings,["portage_confdir"],expand=0) """ Setup our mount points """ + # initialize our target mounts. + self.target_mounts = TARGET_MOUNTS_DEFAULTS.copy() if "SNAPCACHE" in self.settings: self.mounts = ["proc", "dev", "portdir", "distdir", "port_tmpdir"] self.mountmap = { @@ -230,12 +246,13 @@ class generic_stage_target(generic_target): self.mounts.append("ccache") self.mountmap["ccache"] = ccdir """ for the chroot: """ - self.env["CCACHE_DIR"]="/var/tmp/ccache" + self.env["CCACHE_DIR"] = self.target_mounts["ccache"] if "ICECREAM" in self.settings: self.mounts.append("/var/cache/icecream") self.mountmap["/var/cache/icecream"]="/var/cache/icecream" - self.env["PATH"]="/usr/lib/icecc/bin:"+self.env["PATH"] + self.env["PATH"] = self.target_mounts["icecream"] + ":" + \ + self.env["PATH"] if "port_logdir" in self.settings: self.mounts.append("port_logdir") @@ -614,33 +631,34 @@ class generic_stage_target(generic_target): "kill-chroot-pids script failed.",env=self.env) def mount_safety_check(self): - mypath=self.settings["chroot_path"] - """ Check and verify that none of our paths in mypath are mounted. We don't want to clean up with things still mounted, and this allows us to check. Returns 1 on ok, 0 on "something is still mounted" case. """ - if not os.path.exists(mypath): + if not os.path.exists(self.settings["chroot_path"]): return + print "self.mounts =", self.mounts for x in self.mounts: - if not os.path.exists(mypath + self.mountmap[x]): + target = normpath(self.settings["chroot_path"] + self.target_mounts[x]) + print "mount_safety_check() x =", x, target + if not os.path.exists(target): continue - if ismount(mypath + self.mountmap[x]): + if ismount(target): """ Something is still mounted "" """ try: - print self.mountmap[x] + " is still mounted; performing auto-bind-umount...", + print target + " is still mounted; performing auto-bind-umount...", """ Try to umount stuff ourselves """ self.unbind() - if ismount(mypath + self.mountmap[x]): - raise CatalystError, "Auto-unbind failed for " + self.mountmap[x] + if ismount(target): + raise CatalystError, "Auto-unbind failed for " + target else: print "Auto-unbind successful..." except CatalystError: - raise CatalystError, "Unable to auto-unbind " + self.mountmap[x] + raise CatalystError, "Unable to auto-unbind " + target def unpack(self): unpack=True @@ -908,12 +926,14 @@ class generic_stage_target(generic_target): def bind(self): for x in self.mounts: - if not os.path.exists(self.settings["chroot_path"] + self.mountmap[x]): - os.makedirs(self.settings["chroot_path"]+x,0755) + #print "bind(); x =", x + target = normpath(self.settings["chroot_path"] + self.target_mounts[x]) + if not os.path.exists(target): + os.makedirs(target, 0755) if not os.path.exists(self.mountmap[x]): if not self.mountmap[x] == "tmpfs": - os.makedirs(self.mountmap[x],0755) + os.makedirs(self.mountmap[x], 0755) src=self.mountmap[x] #print "bind(); src =", src @@ -921,20 +941,22 @@ class generic_stage_target(generic_target): self.snapshot_lock_object.read_lock() if os.uname()[0] == "FreeBSD": if src == "/dev": - retval = os.system("mount -t devfs none " + - self.settings["chroot_path"] + src) + cmd = "mount -t devfs none " + target + retval=os.system(cmd) else: - retval = os.system("mount_nullfs " + src + " " + - self.settings["chroot_path"] + src) + cmd = "mount_nullfs " + src + " " + target + retval=os.system(cmd) else: if src == "tmpfs": if "var_tmpfs_portage" in self.settings: - retval=os.system("mount -t tmpfs -o size="+\ - self.settings["var_tmpfs_portage"]+"G "+src+" "+\ - self.settings["chroot_path"]+x) + cmd = "mount -t tmpfs -o size=" + \ + self.settings["var_tmpfs_portage"] + "G " + \ + src + " " + target + retval=os.system(cmd) else: - retval = os.system("mount --bind " + src + " " + - self.settings["chroot_path"] + src) + cmd = "mount --bind " + src + " " + target + #print "bind(); cmd =", cmd + retval=os.system(cmd) if retval!=0: self.unbind() raise CatalystError,"Couldn't bind mount " + src @@ -946,26 +968,25 @@ class generic_stage_target(generic_target): myrevmounts.reverse() """ Unmount in reverse order for nested bind-mounts """ for x in myrevmounts: - if not os.path.exists(mypath + self.mountmap[x]): + target = normpath(mypath + self.target_mounts[x]) + if not os.path.exists(target): continue - if not ismount(mypath + self.mountmap[x]): + if not ismount(target): continue - retval=os.system("umount "+\ - os.path.join(mypath, self.mountmap[x].lstrip(os.path.sep))) + retval=os.system("umount " + target) if retval!=0: - warn("First attempt to unmount: " + mypath + - self.mountmap[x] +" failed.") + warn("First attempt to unmount: " + target + " failed.") warn("Killing any pids still running in the chroot") self.kill_chroot_pids() - retval2 = os.system("umount " + mypath + self.mountmap[x]) + retval2 = os.system("umount " + target) if retval2!=0: ouch=1 - warn("Couldn't umount bind mount: " + mypath + self.mountmap[x]) + warn("Couldn't umount bind mount: " + target) if "SNAPCACHE" in self.settings and x == "/usr/portage": try: diff --git a/modules/stage1_target.py b/modules/stage1_target.py index aa43926..5f4ffa0 100644 --- a/modules/stage1_target.py +++ b/modules/stage1_target.py @@ -88,8 +88,9 @@ class stage1_target(generic_stage_target): os.makedirs(self.settings["stage_path"]+"/proc") # alter the mount mappings to bind mount proc onto it - self.mounts.append("/tmp/stage1root/proc") - self.mountmap["/tmp/stage1root/proc"]="/proc" + self.mounts.append("stage1root/proc") + self.target_mounts["stage1root/proc"] = "/tmp/stage1root/proc" + self.mountmap["stage1root/proc"] = "/proc" def register(foo): foo.update({"stage1":stage1_target})