From 8a75ee8fe5b6c96be022ac9bf3ee16343abe0469 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@redhat.com>
Date: Thu, 10 Jan 2002 21:20:54 +0000
Subject: merge fix from head for updates.img in RedHat/base

---
 loader/loader.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'loader')

diff --git a/loader/loader.c b/loader/loader.c
index 3410cea94..267e9ba9e 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1196,7 +1196,8 @@ static char * mountNfsImage(struct installMethod * method,
 #ifdef INCLUDE_NETWORK
 
 static int loadSingleUrlImage(struct iurlinfo * ui, char * file, int flags, 
-			char * dest, char * mntpoint, char * device) {
+			char * dest, char * mntpoint, char * device,
+			int silentErrors) {
     int fd;
     int rc;
     char * newFile = NULL;
@@ -1215,6 +1216,7 @@ static int loadSingleUrlImage(struct iurlinfo * ui, char * file, int flags,
 
 	if (fd == -2) return 1;
 	if (fd < 0) {
+	  if (!silentErrors) 
 	    newtWinMessage(_("Error"), _("OK"),
 			    _("File %s/%s not found on server."), 
 			    ui->prefix, file);
@@ -1243,7 +1245,7 @@ static int loadUrlImages(struct iurlinfo * ui, int flags) {
      * we can minimize our ramdisk size */
     if (!loadSingleUrlImage(ui, "RedHat/base/updates.img", flags,
 			    "/tmp/ramfs/updates-disk.img",
-			    "/tmp/update-disk", "loop7")) {
+			    "/tmp/update-disk", "loop7", 1)) {
 	/* copy the updates, then unmount the loopback and unlink the img */
 	copyDirectory("/tmp/update-disk", "/tmp/updates");
 	umountLoopback("/tmp/update-disk", "loop7");
@@ -1252,7 +1254,7 @@ static int loadUrlImages(struct iurlinfo * ui, int flags) {
 	
     if (loadSingleUrlImage(ui, "RedHat/base/netstg1.img", flags, 
 			   "/tmp/ramfs/netstg1.img",
-			   "/mnt/runtime", "loop0")) {
+			   "/mnt/runtime", "loop0", 0)) {
 	newtWinMessage(ui->protocol == URL_METHOD_FTP ?
 			_("FTP") : _("HTTP"), _("OK"), 
 	       _("Unable to retrieve the first install image"));
-- 
cgit