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

[PATCH rhel6-branch 1/3] Copy install.img and remount no matter how many discs (#577196)



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 4a91186..3744e88 100644
--- a/backend.py
+++ b/backend.py
@@ -156,8 +156,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.id.storage.fsFreeSpace
         self._loopbackFile = "%s%s/rhinstall-install.img" % (anaconda.rootPath,
diff --git a/yuminstall.py b/yuminstall.py
index 858fe0a..a9b0d52 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -888,11 +888,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.id.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
-- 
1.7.0.1


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