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 6d780fa7b9f7eac66525e5359e1c8355fc841a29..7d0fbe755e56ac8748536285f155f31a5296e4f0 100644 (file)
--- 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 <rocket@gentoo.org> catalyst:
+  Remove bind mounts before rm operations happen at startup
 
   26 Apr 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/catalyst b/catalyst
index 43efd8bb9d0db6727ed05233a3a246638175049c..33cfb06affdf5ef3ad1986efc2bf2de1943bc029 100755 (executable)
--- 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 <rocket@gentoo.org>
@@ -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()