From: Eric Edgar Date: Tue, 26 Apr 2005 18:30:50 +0000 (+0000) Subject: Remove bind mounts before rm operations happen at startup X-Git-Tag: CATALYST_2_0_6_916~756 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=787f262ae8bf8d967a4f6b38c050a4c5e390b8c6;p=catalyst.git Remove bind mounts before rm operations happen at startup git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@627 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 6d780fa7..7d0fbe75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.239 2005/04/26 18:28:26 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.240 2005/04/26 18:30:50 rocket Exp $ + + 26 Apr 2005; Eric Edgar catalyst: + Remove bind mounts before rm operations happen at startup 26 Apr 2005; Eric Edgar modules/generic_stage_target.py: diff --git a/catalyst b/catalyst index 43efd8bb..33cfb06a 100755 --- a/catalyst +++ b/catalyst @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.75 2005/04/21 18:18:46 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.76 2005/04/26 18:30:50 rocket Exp $ # Maintained in full by: # Eric Edgar @@ -183,6 +183,9 @@ def build_target(addlargs, targetmap): mytarget=targetmap[addlargs["target"]](conf_values, addlargs) + # Check for mounts right away and abort if we cannot unmount them. + mytarget.mount_safety_check() + if conf_values.has_key("CLEAR_AUTORESUME"): mytarget.clear_autoresume()