Somehow this hosts.bck fix got reverted and I really don't know how. Anyway, I'm...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1121 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 4759d206cd9b2c762a9c886f8303219b6d195cdc..0325de50c7dabcfcc994376921a52296c7d969ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.606 2006/04/20 15:17:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.607 2006/04/21 13:00:50 wolf31o2 Exp $
+
+  21 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/generic_stage_target.py:
+  Somehow this hosts.bck fix got reverted and I really don't know how. Anyway,
+  I'm adding it back.
 
   20 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/livecd-stage2/livecd-stage2-controller.sh,

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 8d7a52f2c85f084135f2055540d8ca147997a068..d65d443f051253c575ff387784c94d7e131fcc4f 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.131 2006/04/18 20:57:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.132 2006/04/21 13:00:50 wolf31o2 Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -937,7 +937,7 @@ class generic_stage_target(generic_target):
                            cmd("rm -rf "+self.settings["destpath"]+x,"Couldn't clean "+x,env=self.env)
 
                    # put /etc/hosts back into place
-                   if os.path.exists("/etc/hosts.bck"):
+                   if os.path.exists(self.settings["chroot_path"]+"/etc/hosts.bck"):
                            cmd("mv -f "+self.settings["chroot_path"]+"/etc/hosts.bck "+self.settings["chroot_path"]+\
                                          "/etc/hosts", "Could not replace /etc/hosts",env=self.env)