QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marek Marczykowski 2012-04-28 02:46:10 +02:00
parent 5fd3c8b151
commit 0d804af891
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
anaconda/backend.py
View File

@ -188,7 +188,7 @@ class AnacondaBackend:
return 1 return 1
isys.lochangefd("/dev/loop0", self._loopbackFile) 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") isys.umount("/mnt/stage2")
def removeInstallImage(self): def removeInstallImage(self):

2
anaconda/scripts/mk-images.x86
View File

@ -100,7 +100,7 @@ makeBootImages() {
# insert XEN boot options # insert XEN boot options
sed -i 's/kernel vmlinuz/kernel mboot.c32/' $MBD_BOOTTREE/isolinux.cfg 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 # copy in memtest if present
if [ -f $IMGPATH/usr/lib/anaconda-runtime/boot/memtest* ]; then if [ -f $IMGPATH/usr/lib/anaconda-runtime/boot/memtest* ]; then

4
anaconda/yuminstall.py
View File

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