diff options
| author | jkh <jkh@FreeBSD.org> | 1997-01-17 19:00:38 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-01-17 19:00:38 +0000 |
| commit | 48a07301bbfe42ba387d13c77eb6bdd49ef289ed (patch) | |
| tree | 0c7fc81ebabcda598a6f392b2f88baa43b3364ed /release | |
| parent | 7c66c44c4ff23dfaaf664650aa0b4309af5dadbc (diff) | |
| download | FreeBSD-src-48a07301bbfe42ba387d13c77eb6bdd49ef289ed.zip FreeBSD-src-48a07301bbfe42ba387d13c77eb6bdd49ef289ed.tar.gz | |
Be more aggressive about timeouts.
Diffstat (limited to 'release')
| -rw-r--r-- | release/sysinstall/dist.c | 4 | ||||
| -rw-r--r-- | release/sysinstall/media.c | 4 |
2 files changed, 5 insertions, 3 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 { |
