anaconda: use packages from already mounted /mnt/stage2 if commanded so (#440)

anaconda/backend.py

@@ -188,7 +188,7 @@ class AnacondaBackend:
             return 1
 
         isys.lochangefd("/dev/loop0", self._loopbackFile)
-        if os.path.ismount("/mnt/stage2"):
+        if os.path.ismount("/mnt/stage2") and not anaconda.methodstr.find("/mnt/stage2") >= 0:
             isys.umount("/mnt/stage2")
 
     def removeInstallImage(self):

anaconda/scripts/mk-images.x86

@@ -100,7 +100,7 @@ makeBootImages() {
 
 	# insert XEN boot options
 	sed -i 's/kernel vmlinuz/kernel mboot.c32/' $MBD_BOOTTREE/isolinux.cfg
-	sed -i "s/append initrd=[^ ]*\(.*\)/append $xenimage --- $kernelimage stage2=hd:LABEL=\"$CDLABEL\"\1 --- $initrd/" $MBD_BOOTTREE/isolinux.cfg
+	sed -i "s/append initrd=[^ ]*\(.*\)/append $xenimage --- $kernelimage stage2=hd:LABEL=\"$CDLABEL\":\/images\/install.img repo=file:\/mnt\/stage2\1 --- $initrd/" $MBD_BOOTTREE/isolinux.cfg
 
 	# copy in memtest if present
 	if [ -f $IMGPATH/usr/lib/anaconda-runtime/boot/memtest* ]; then

anaconda/yuminstall.py

@@ -492,6 +492,10 @@ class AnacondaYum(YumSorter):
                 self._switchCD(1)
                 self.mediagrabber = self.mediaHandler
                 self._baseRepoURL = "file://%s" % self.tree
+            elif m.startswith("file:"):
+                self.tree = m[5:]
+                self._baseRepoURL = "file://%s" % self.tree
+
         else:
             # No methodstr was given.  In order to find an installation source,
             # we should first check to see if there's a CD/DVD with packages