2007-04-12 Jeremy Katz <katzj@redhat.com>

	* urlinstall.py (UrlInstallMethod.systemMounted): Don't copy
	stage2.img if we can't find it
	* image.py (CdromInstallMethod.systemMounted): Likewise.

	* anaconda (setupEnvironment): Make sure we have /sbin and
	/usr/sbin in our path

1 files changed, 4 insertions, 0 deletions

diff --git a/image.py b/image.py
index dd284ef8b..dd124a910 100644
--- a/image.py
+++ b/image.py
@@ -158,6 +158,10 @@ class CdromInstallMethod(ImageInstallMethod):
 	    self.loopbackFile = None
 
     def systemMounted(self, fsset, chroot):
+        if not os.path.exists("%s/images/stage2.img" %(self.tree,)):
+            log.debug("Not copying non-existent stage2.img")
+            return
+        
 	self.loopbackFile = "%s%s%s" % (chroot,
                                         fsset.filesystemSpace(chroot)[0][0],
                                         "/rhinstall-stage2.img")