On Fri, 2009-11-13 at 10:16 +0100, Hans de Goede wrote:
> Hi Jerry,
>
> Many thanks for the patch, I'll let others who know this part
> of the code better review it, but I still wanted to say thanks :)
>
> Regards,
>
> Hans
>
revised patch & tested with both preupgrade and 12.46-2 on a usbkey
anaconda.log from uskey install:
15:12:59 DEBUG : isys.py:mount()- going to mount /dev/loop1
on /mnt/source as
iso9660 with options defaults,ro
15:12:59 INFO : mediaDevice is None
15:12:59 INFO : Using /mnt/source/images/install.img as stage2 image
15:12:59 INFO : Full image path
is /mnt/sysimage/tmp/rhinstall-install.img
15:12:59 INFO : OVERRIDE Using /tmp/install.img as stage2 image
15:13:02 INFO : set mediaid of repo InstallationRepo to:
1257724710.186325
15:13:28 INFO : moving (1) to step tasksel
Sorry, forgot to save the one from the preupgrade session.
Jerry
diff -up ./backend.py.orig ./backend.py
--- ./backend.py.orig 2009-11-16 17:58:30.000000000 -0600
+++ ./backend.py 2009-11-16 18:00:15.000000000 -0600
@@ -153,29 +153,45 @@ class AnacondaBackend:
if not flags.setupFilesystems:
return
- if self._loopbackFile and os.path.exists(self._loopbackFile):
- return
+ log.info("mediaDevice is %s" % anaconda.mediaDevice )
+ # If they booted with a boot.iso, just continue using that install.img.
- # If we've booted off the first CD/DVD (so, not the boot.iso) then
- # copy the install.img to the filesystem and switch loopback devices
- # to there. Otherwise we won't be able to unmount and swap media.
- if not anaconda.mediaDevice or not os.path.exists(installimg):
+ if os.path.exists("/mnt/stage2/images/install.img"):
+ log.info("Don't need to transfer stage2 image")
return
-
- free = anaconda.id.storage.fsFreeSpace
+
+ log.info("Using %s as stage2 image" % installimg)
self._loopbackFile = "%s%s/rhinstall-install.img" % (anaconda.rootPath,
- free[0][0])
+ "/tmp")
+ log.info("Full image path is %s" % self._loopbackFile )
+
+ if self._loopbackFile and os.path.exists(self._loopbackFile):
+ log.info("and exists and removing %s" % self._loopbackFile )
+ try:
+ os.unlink(self._loopbackFile)
+ except:
+ pass
+
+ # This s/b the one that was copied into /tmp ....
+ # Why was this copied to ram when you have passed stage2=
+ # lets free the RAM
+ if os.path.exists("/tmp/install.img"):
+ log.info("OVERRIDE Using /tmp/install.img as stage2 image")
+ stage2img = "/tmp/install.img"
+ stage2ram = 1
+ else:
+ stage2img = installimg
try:
win = anaconda.intf.waitWindow(_("Copying File"),
- _("Transferring install image to hard drive"))
- shutil.copyfile(installimg, self._loopbackFile)
+ _("Transferring install image to hard drive..."))
+ shutil.copyfile(stage2img, self._loopbackFile)
win.pop()
except Exception, e:
if win:
win.pop()
- log.critical("error transferring install.img: %s" %(e,))
+ log.critical("error transferring stage2img: %s" %(e,))
if isinstance(e, IOError) and e.errno == 5:
msg = _("An error occurred transferring the install image "
@@ -195,7 +211,21 @@ class AnacondaBackend:
return 1
isys.lochangefd("/dev/loop0", self._loopbackFile)
- isys.umount("/mnt/stage2")
+
+ # install.img is now in /tmp get rid of the original in boot
+ if os.path.exists("/mnt/sysimage/boot/upgrade/install.img"):
+ log.info("REMOVING install.img from /mnt/sysimage/boot/upgrade")
+ os.unlink("/mnt/sysimage/boot/upgrade/install.img")
+
+ if stage2ram:
+ try:
+ os.unlink(stage2img)
+ except:
+ pass
+ try:
+ isys.umount("/mnt/stage2")
+ except:
+ pass
def removeInstallImage(self):
if self._loopbackFile:
diff -up ./yuminstall.py.orig ./yuminstall.py
--- ./yuminstall.py.orig 2009-11-16 17:59:45.000000000 -0600
+++ ./yuminstall.py 2009-11-16 18:00:15.000000000 -0600
@@ -625,6 +625,9 @@ class AnacondaYum(YumSorter):
def doConfigSetup(self, fn='/tmp/anaconda-yum.conf', root='/'):
+ stage2img = "%s/images/install.img" % self.tree
+ self.anaconda.backend.mountInstallImage(self.anaconda, stage2img)
+
if hasattr(self, "preconf"):
self.preconf.fn = fn
self.preconf.root = root
@@ -828,12 +831,6 @@ class AnacondaYum(YumSorter):
mkeys = self.tsInfo.reqmedia.keys()
mkeys.sort(mediasort)
- if len(mkeys) > 1:
- stage2img = "%s/images/install.img" % self.tree
- if self.anaconda.backend.mountInstallImage(self.anaconda, stage2img):
- self.anaconda.id.storage.umountFilesystems()
- return DISPATCH_BACK
-
for i in mkeys:
self.tsInfo.curmedia = i
if i > 0:
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
