diff options
author | jkh <jkh@FreeBSD.org> | 1999-12-14 04:25:29 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1999-12-14 04:25:29 +0000 |
commit | d3944eb60a18bfd5f8b4b6ff033a61a20f2383cc (patch) | |
tree | e8c2e2130b60892a8d69589245c55613e2ca6edf /usr.sbin/sysinstall/package.c | |
parent | 796518d06842cbc05ce0994ade4027837c42cec0 (diff) | |
download | FreeBSD-src-d3944eb60a18bfd5f8b4b6ff033a61a20f2383cc.zip FreeBSD-src-d3944eb60a18bfd5f8b4b6ff033a61a20f2383cc.tar.gz |
Completely rip-out and redesign sysinstall's refresh model as well
as redoing all the menus to have proper, or at least non-hallucinogenic,
keyboard accelerators.
This requires my recent update to libdialog to work properly and will
probably also exhibit some other "interesting" behavior while the last
few missing screen clears are found (which is why I'm not going to MFC
immediately). At least now, however, sysinstall does not gratuitously
redraw random screens at the drop of a hat and drive serial console
installers out of their minds.
Diffstat (limited to 'usr.sbin/sysinstall/package.c')
-rw-r--r-- | usr.sbin/sysinstall/package.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c index 185956f..e11a2c7 100644 --- a/usr.sbin/sysinstall/package.c +++ b/usr.sbin/sysinstall/package.c @@ -74,7 +74,7 @@ package_add(char *name) return index_extract(mediaDevice, &Top, tmp, FALSE); else { msgConfirm("Sorry, package %s was not found in the INDEX.", name); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } } @@ -134,7 +134,7 @@ package_extract(Device *dev, char *name, Boolean depended) vsystem("/sbin/ldconfig -aout /usr/lib/compat/aout /usr/lib/aout /usr/X11R6/lib/aout /usr/local/lib/aout"); /* Be initially optimistic */ - ret = DITEM_SUCCESS | DITEM_RESTORE; + ret = DITEM_SUCCESS; /* Make a couple of paranoid locations for temp files to live if user specified none */ if (!variable_get(VAR_PKG_TMPDIR)) { /* Set it to a location with as much space as possible */ @@ -217,7 +217,7 @@ package_extract(Device *dev, char *name, Boolean depended) refresh(); i = waitpid(pid, &tot, 0); if (sigpipe_caught || i < 0 || WEXITSTATUS(tot)) { - ret = DITEM_FAILURE | DITEM_RESTORE; + ret = DITEM_FAILURE; if (variable_get(VAR_NO_CONFIRM)) msgNotify("Add of package %s aborted, error code %d -\n" "Please check the debug screen for more info.", name, WEXITSTATUS(tot)); @@ -236,14 +236,13 @@ package_extract(Device *dev, char *name, Boolean depended) } } else { - dialog_clear_norefresh(); if (variable_get(VAR_NO_CONFIRM)) msgNotify("Unable to fetch package %s from selected media.\n" "No package add will be done.", name); else msgConfirm("Unable to fetch package %s from selected media.\n" "No package add will be done.", name); - ret = DITEM_FAILURE | DITEM_RESTORE; + ret = DITEM_FAILURE; } signal(SIGPIPE, SIG_IGN); return ret; |