summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/media.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1997-01-17 08:47:13 +0000
committerjkh <jkh@FreeBSD.org>1997-01-17 08:47:13 +0000
commit01b3e9a58be60d613a1575a5cd4341ab143f4ad3 (patch)
tree1d6cafcedb59c96ea3e9343e95b8c4dc482c6a3b /usr.sbin/sysinstall/media.c
parent83c2f5687e154ea6600cc012b5003a582b4f0dee (diff)
downloadFreeBSD-src-01b3e9a58be60d613a1575a5cd4341ab143f4ad3.zip
FreeBSD-src-01b3e9a58be60d613a1575a5cd4341ab143f4ad3.tar.gz
Now that I know which parts of the installation really need it (since
there's no menu display bug to work around now), be far more selective in my use of DITEM_RECREATE (which is slow and involves much screen I/O).
Diffstat (limited to 'usr.sbin/sysinstall/media.c')
-rw-r--r--usr.sbin/sysinstall/media.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index 7a3f29e..8bade8a 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -105,11 +105,11 @@ mediaSetCDROM(dialogMenuItem *self)
status = dmenuOpenSimple(menu, FALSE);
free(menu);
if (!status)
- return DITEM_FAILURE | DITEM_RECREATE;
+ return DITEM_FAILURE | DITEM_RESTORE;
}
else
mediaDevice = devs[0];
- return (mediaDevice ? DITEM_SUCCESS | DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RECREATE;
+ return (mediaDevice ? DITEM_SUCCESS | DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE;
}
static int
@@ -146,11 +146,11 @@ mediaSetFloppy(dialogMenuItem *self)
status = dmenuOpenSimple(menu, FALSE);
free(menu);
if (!status)
- return DITEM_FAILURE | DITEM_RECREATE;
+ return DITEM_FAILURE | DITEM_RESTORE;
}
else
mediaDevice = devs[0];
- return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RECREATE;
+ return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE;
}
static int
@@ -185,11 +185,11 @@ mediaSetDOS(dialogMenuItem *self)
status = dmenuOpenSimple(menu, FALSE);
free(menu);
if (!status)
- return DITEM_FAILURE | DITEM_RECREATE;
+ return DITEM_FAILURE | DITEM_RESTORE;
}
else
mediaDevice = devs[0];
- return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RECREATE;
+ return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE;
}
static int
@@ -226,7 +226,7 @@ mediaSetTape(dialogMenuItem *self)
status = dmenuOpenSimple(menu, FALSE);
free(menu);
if (!status)
- return DITEM_FAILURE | DITEM_RECREATE;
+ return DITEM_FAILURE | DITEM_RESTORE;
}
else
mediaDevice = devs[0];
@@ -243,7 +243,7 @@ mediaSetTape(dialogMenuItem *self)
else
mediaDevice->private = strdup(val);
}
- return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RECREATE;
+ return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE;
}
/*
@@ -267,10 +267,10 @@ mediaSetFTP(dialogMenuItem *self)
if (!cp) {
dialog_clear_norefresh();
if (!dmenuOpenSimple(&MenuMediaFTP, FALSE))
- return DITEM_FAILURE | DITEM_RECREATE;
+ return DITEM_FAILURE | DITEM_RESTORE;
else
cp = variable_get(VAR_FTP_PATH);
- what = DITEM_RECREATE;
+ what = DITEM_RESTORE;
}
if (!cp)
return DITEM_FAILURE | what;
@@ -625,7 +625,7 @@ mediaGetType(dialogMenuItem *self)
int i;
i = dmenuOpenSimple(&MenuMedia, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE;
- return i | DITEM_RECREATE;
+ return i | DITEM_RESTORE;
}
/* Return TRUE if all the media variables are set up correctly */
OpenPOWER on IntegriCloud