aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/sysinstall
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1997-01-19 10:27:12 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1997-01-19 10:27:12 +0000
commitb4045b65fe91c2082c598d1166a99e608c885859 (patch)
treee900a4e6fa95b04124110556af5bf33aa7a94664 /usr.sbin/sysinstall
parent0ebf0addab94ec5e7eca1a42d1735da96312ae70 (diff)
downloadsrc-b4045b65fe91c2082c598d1166a99e608c885859.tar.gz
src-b4045b65fe91c2082c598d1166a99e608c885859.zip
Correct a real brain-o in my check for when a "fixup" should be run.
Don't recreate parent menus just for submenus - it's irritating.
Notes
Notes: svn path=/head/; revision=21861
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r--usr.sbin/sysinstall/dmenu.c2
-rw-r--r--usr.sbin/sysinstall/install.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c
index c8094d8add4d..2bdf76250b4c 100644
--- a/usr.sbin/sysinstall/dmenu.c
+++ b/usr.sbin/sysinstall/dmenu.c
@@ -52,7 +52,7 @@ int
dmenuSubmenu(dialogMenuItem *tmp)
{
return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE) |
- DITEM_RECREATE;
+ DITEM_RESTORE;
}
int
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 27d826e0b406..61fe69650617 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -716,10 +716,10 @@ installCommit(dialogMenuItem *self)
need_bin = Dists & DIST_BIN;
i = distExtractAll(self);
- if (DITEM_STATUS(i) == DITEM_SUCCESS && (!need_bin || !(Dists & DIST_BIN)))
- i = installFixup(self);
- else
- i = DITEM_FAILURE;
+ if (DITEM_STATUS(i) == DITEM_SUCCESS) {
+ if (need_bin && !(Dists & DIST_BIN))
+ i = installFixup(self);
+ }
variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
return i | DITEM_RESTORE;
}