summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--release/sysinstall/dist.c4
-rw-r--r--release/sysinstall/media.c4
-rw-r--r--usr.sbin/sysinstall/dist.c4
-rw-r--r--usr.sbin/sysinstall/media.c4
4 files changed, 10 insertions, 6 deletions
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index ea7a781..7bd3795 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -497,8 +497,10 @@ distExtract(char *parent, Distribution *me)
alarm_set(MEDIA_TIMEOUT, media_timeout);
n = fread(buf, 1, BUFSIZ, fp);
alarm_clear();
- if (n <= 0 || AlarmWentOff)
+ if (n <= 0 || AlarmWentOff) {
+ msgConfirm("Read error on media (timeout or user abort).\n");
break;
+ }
total += n;
/* Print statistics about how we're doing */
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c
index cc8e2aa..af41a2d 100644
--- a/release/sysinstall/media.c
+++ b/release/sysinstall/media.c
@@ -599,11 +599,11 @@ mediaExtractDist(char *dir, char *dist, FILE *fp)
while ((i = fread(buf, 1, BUFSIZ, fp)) > 0) {
alarm_clear();
if (AlarmWentOff) {
- msgDebug("Failure to read from media - timeout or user abort.\n");
+ msgConfirm("Failure to read from media - timeout or user abort.\n");
break;
}
if (write(qfd[1], buf, i) != i) {
- msgDebug("Write error on transfer to cpio process, try of %d bytes\n", i);
+ msgConfirm("Write error on transfer to cpio process, try of %d bytes\n", i);
break;
}
else {
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index ea7a781..7bd3795 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -497,8 +497,10 @@ distExtract(char *parent, Distribution *me)
alarm_set(MEDIA_TIMEOUT, media_timeout);
n = fread(buf, 1, BUFSIZ, fp);
alarm_clear();
- if (n <= 0 || AlarmWentOff)
+ if (n <= 0 || AlarmWentOff) {
+ msgConfirm("Read error on media (timeout or user abort).\n");
break;
+ }
total += n;
/* Print statistics about how we're doing */
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index cc8e2aa..af41a2d 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -599,11 +599,11 @@ mediaExtractDist(char *dir, char *dist, FILE *fp)
while ((i = fread(buf, 1, BUFSIZ, fp)) > 0) {
alarm_clear();
if (AlarmWentOff) {
- msgDebug("Failure to read from media - timeout or user abort.\n");
+ msgConfirm("Failure to read from media - timeout or user abort.\n");
break;
}
if (write(qfd[1], buf, i) != i) {
- msgDebug("Write error on transfer to cpio process, try of %d bytes\n", i);
+ msgConfirm("Write error on transfer to cpio process, try of %d bytes\n", i);
break;
}
else {
OpenPOWER on IntegriCloud