summaryrefslogtreecommitdiffstats
path: root/release/sysinstall/doc.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1996-05-16 11:47:46 +0000
committerjkh <jkh@FreeBSD.org>1996-05-16 11:47:46 +0000
commit7560ec91cb3ab69ac43c0b950636e8fb5cd679a8 (patch)
treead4bc78c2672e660c67bf48d392df7569092418a /release/sysinstall/doc.c
parent996907c1963a00f3889ca45db47ef7ec7d08c25c (diff)
downloadFreeBSD-src-7560ec91cb3ab69ac43c0b950636e8fb5cd679a8.zip
FreeBSD-src-7560ec91cb3ab69ac43c0b950636e8fb5cd679a8.tar.gz
Fix some long-standing malloc bugs in the package handling code (freeing garbage
in one place, leaking memory in another). Add a facility to invoke subsystems directly by naming them on sysinstall's command-line when running post-install. A replacement for pkg_manage might, for example, be `/stand/sysinstall configPackages' Fix bogon where upgrade shell was entered with tty modes spammed. Fix bug with release name checking in ftp_strat. Turned a bunch of bogus exit()s into proper calls to systemShutdown().
Diffstat (limited to 'release/sysinstall/doc.c')
-rw-r--r--release/sysinstall/doc.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/release/sysinstall/doc.c b/release/sysinstall/doc.c
index 069e145..68e9e71 100644
--- a/release/sysinstall/doc.c
+++ b/release/sysinstall/doc.c
@@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
- * $Id: doc.c,v 1.14 1996/04/25 17:31:17 jkh Exp $
+ * $Id: doc.c,v 1.15 1996/04/28 03:26:52 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -52,17 +52,15 @@ docBrowser(dialogMenuItem *self)
return DITEM_FAILURE;
}
- /* Make sure we have media available */
- if (!mediaVerify())
- return DITEM_FAILURE;
-
/* First, make sure we have whatever browser we've chosen is here */
- ret = package_add(browser);
- if (DITEM_STATUS(ret) != DITEM_SUCCESS) {
- msgConfirm("Unable to install the %s HTML browser package. You may\n"
- "wish to verify that your media is configured correctly and\n"
- "try again.", browser);
- return ret;
+ if (!package_exists(browser)) {
+ ret = package_add(browser);
+ if (DITEM_STATUS(ret) != DITEM_SUCCESS) {
+ msgConfirm("Unable to install the %s HTML browser package. You may\n"
+ "wish to verify that your media is configured correctly and\n"
+ "try again.", browser);
+ return ret;
+ }
}
if (!file_executable(variable_get(VAR_BROWSER_BINARY))) {
OpenPOWER on IntegriCloud