---
loader/urlinstall.c | 4 ----
pyanaconda/image.py | 6 +++---
pyanaconda/yuminstall.py | 7 -------
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/loader/urlinstall.c b/loader/urlinstall.c
index 000c025..0998198 100644
--- a/loader/urlinstall.c
+++ b/loader/urlinstall.c
@@ -168,8 +168,6 @@ int loadUrlImages(struct loaderData_s *loaderData) {
if (!loaderData->instRepo)
return 0;
- /* grab the updates.img before install.img so that we minimize our
- * ramdisk usage */
checked_asprintf(&url, "%s/images/%s", loaderData->instRepo, "updates.img");
if (!loadSingleUrlImage(loaderData, url, "/tmp/updates-disk.img", "/tmp/update-disk", 1)) {
@@ -185,8 +183,6 @@ int loadUrlImages(struct loaderData_s *loaderData) {
free(url);
- /* grab the product.img before install.img so that we minimize our
- * ramdisk usage */
checked_asprintf(&url, "%s/images/%s", loaderData->instRepo, "product.img");
if (!loadSingleUrlImage(loaderData, url, "/tmp/product-disk.img", "/tmp/product-disk", 1)) {
diff --git a/pyanaconda/image.py b/pyanaconda/image.py
index ab0702e..4a36bbe 100644
--- a/pyanaconda/image.py
+++ b/pyanaconda/image.py
@@ -63,10 +63,10 @@ def findIsoImages(path, messageWindow):
if num not in discNum or discArch != arch:
continue
- # if it's disc1, it needs to have images/install.img
+ # if it's disc1, it needs to have repodata.
if (num == 1 and not
- os.access("/mnt/cdimage/images/install.img", os.R_OK)):
- log.warning("%s doesn't have a install.img, skipping" %(what,))
+ os.access("/mnt/cdimage/repodata", os.R_OK)):
+ log.warning("%s doesn't have repodata, skipping" %(what,))
continue
# warn user if images appears to be wrong size
diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py
index 5caecd8..8622e82 100644
--- a/pyanaconda/yuminstall.py
+++ b/pyanaconda/yuminstall.py
@@ -896,13 +896,6 @@ class AnacondaYum(YumSorter):
self.repos.setCacheDir(self.conf.cachedir)
- if os.path.exists("%s/boot/upgrade/install.img" % self.anaconda.rootPath):
- log.info("REMOVING stage2 image from %s /boot/upgrade" % self.anaconda.rootPath )
- try:
- os.unlink("%s/boot/upgrade/install.img" % self.anaconda.rootPath)
- except:
- log.warning("failed to clean /boot/upgrade")
-
def downloadHeader(self, po):
while True:
# retrying version of download header
--
1.7.1.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
