merge from taroon-branch. all kinds of miscellaneous bugfixes, including

* firewall update
* iSeries PReP size
* ppc mediacheck
* tzdata stuff
* cmdline mode
* pkg defaults screen

1 files changed, 8 insertions, 4 deletions

diff --git a/loader2/urls.c b/loader2/urls.c
index 03acda76e..5074a137e 100644
--- a/loader2/urls.c
+++ b/loader2/urls.c
@@ -144,7 +144,8 @@ char *convertUIToURL(struct iurlinfo *ui) {
 /* see ftp.c:httpGetFileDesc() for details */
 /* set to NULL if not needed */
 int urlinstStartTransfer(struct iurlinfo * ui, char * filename, 
-                         char *extraHeaders, int silentErrors) {
+                         char *extraHeaders, int silentErrors,
+                         int flags) {
     char * buf;
     int fd;
     char * finalPrefix;
@@ -191,17 +192,20 @@ int urlinstStartTransfer(struct iurlinfo * ui, char * filename,
         }
     }
 
-    winStatus(70, 3, _("Retrieving"), "%s %s...", _("Retrieving"), filename);
+    if (!FL_CMDLINE(flags))
+        winStatus(70, 3, _("Retrieving"), "%s %s...", _("Retrieving"), 
+                  filename);
 
     return fd;
 }
 
-int urlinstFinishTransfer(struct iurlinfo * ui, int fd) {
+int urlinstFinishTransfer(struct iurlinfo * ui, int fd, int flags) {
     if (ui->protocol == URL_METHOD_FTP)
         close(ui->ftpPort);
     close(fd);
 
-    newtPopWindow();
+    if (!FL_CMDLINE(flags))
+        newtPopWindow();
 
     return 0;
 }