summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/media.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/sysinstall/media.c')
-rw-r--r--usr.sbin/sysinstall/media.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index 288508a..64a0d48 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -521,7 +521,7 @@ mediaExtractDistEnd(int zpid, int cpid)
static void
media_timeout(int sig)
{
- AlarmWentOff = TRUE;
+ alarm(0);
}
/* Return the timeout interval */
@@ -612,8 +612,7 @@ mediaExtractDist(char *dir, char *dist, FILE *fp)
alarm_set(mediaTimeout(), media_timeout);
while ((i = fread(buf, 1, BUFSIZ, fp)) > 0) {
- alarm_clear();
- if (AlarmWentOff) {
+ if (!alarm_clear()) {
msgConfirm("Failure to read from media - timeout or user abort.\n");
break;
}
OpenPOWER on IntegriCloud