Re: [PATCH] Copy install.img and remount no matter how many discs (#577196)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I am going to apply this patch to master, f13-branch, and
f13-beta-branch. If someone can point out specific problems with it or,
better yet, come up with a better solution, we can replace the fix on
master and perhaps also on f13-branch at a later time. For now, we go
with what works so we can maybe get the f13 beta out the door on time.

Dave

On Tue, 2010-03-30 at 14:43 -0400, Peter Jones wrote:
> It seems we have unmount/reboot problems when using only one disc when
> we don't copy the install.img.  So always do that.
> ---
>  backend.py    |    3 +--
>  yuminstall.py |    9 ++++-----
>  2 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/backend.py b/backend.py
> index 6ca14a8..65a6a67 100644
> --- a/backend.py
> +++ b/backend.py
> @@ -153,8 +153,7 @@ class AnacondaBackend:
>          if self._loopbackFile and os.path.exists(self._loopbackFile):
>              return
>  
> -        # If we've booted off the first CD (so, not the boot.iso or DVD) then
> -        # copy the install.img to the filesystem and switch loopback devices
> +        # Copy the install.img to the filesystem and switch loopback devices
>          # to there.  Otherwise we won't be able to unmount and swap media.
>          free = anaconda.storage.fsFreeSpace
>          self._loopbackFile = "%s%s/rhinstall-install.img" % (anaconda.rootPath,
> diff --git a/yuminstall.py b/yuminstall.py
> index 244702e..de7e974 100644
> --- a/yuminstall.py
> +++ b/yuminstall.py
> @@ -899,11 +899,10 @@ 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.storage.umountFilesystems()
> -                return DISPATCH_BACK
> +        stage2img = "%s/images/install.img" % self.tree
> +        if self.anaconda.backend.mountInstallImage(self.anaconda, stage2img):
> +            self.anaconda.storage.umountFilesystems()
> +            return DISPATCH_BACK
>  
>          for i in mkeys:
>              self.tsInfo.curmedia = i


_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux