summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/options.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1999-04-27 14:33:29 +0000
committerjkh <jkh@FreeBSD.org>1999-04-27 14:33:29 +0000
commit19ffa5eea896737615fbb68cbd6bbcbac4ec4918 (patch)
treea760591f5f1b8bbdeda85d3001444691a1b1c059 /usr.sbin/sysinstall/options.c
parentc85ea5017c00c71172e6cfb5bd1cd171837b5812 (diff)
downloadFreeBSD-src-19ffa5eea896737615fbb68cbd6bbcbac4ec4918.zip
FreeBSD-src-19ffa5eea896737615fbb68cbd6bbcbac4ec4918.tar.gz
o Make package matching for specific package loading use the Latest/
feature of packages now so that no version info is embedded. o Add a default X desktop menu offering afterstep, enlightenment, KDE, GNOME and Windowmaker desktops instead of the boring twm(1) based one if the user so chooses. This will require a little testing.
Diffstat (limited to 'usr.sbin/sysinstall/options.c')
-rw-r--r--usr.sbin/sysinstall/options.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index 5365d77..ae660d7 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.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: options.c,v 1.57 1999/02/05 22:15:51 jkh Exp $
+ * $Id: options.c,v 1.58 1999/04/06 08:25:53 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -101,8 +101,6 @@ mediaCheck(Option opt)
#define PKG_PROMPT "Please specify a temporary directory with lots of free space:"
#define INSTROOT_PROMPT "Please specify a root directory if installing somewhere other than /"
#define TIMEOUT_PROMPT "Please specify the number of seconds to wait for slow media:"
-#define GATED_PKG_PROMPT "Please specify the package name for the gated software:"
-#define PCNFSD_PKG_PROMPT "Please specify the package name for the PCNFSD server:"
static Option Options[] = {
{ "NFS Secure", "NFS server talks only on a secure port",
@@ -137,10 +135,6 @@ static Option Options[] = {
OPT_IS_VAR, TIMEOUT_PROMPT, VAR_MEDIA_TIMEOUT, varCheck },
{ "Package Temp", "The directory where package temporary files should go",
OPT_IS_VAR, PKG_PROMPT, VAR_PKG_TMPDIR, varCheck },
-{ "Gated package", "The name of the gated package to install if requested",
- OPT_IS_VAR, GATED_PKG_PROMPT, VAR_GATED_PKG, varCheck },
-{ "PCNFSD package", "The name of the PCNFSD package to install if requested",
- OPT_IS_VAR, PCNFSD_PKG_PROMPT, VAR_PCNFSD_PKG, varCheck },
{ "Re-scan Devices", "Re-run sysinstall's initial device probe",
OPT_IS_FUNC, deviceRescan },
{ "Use Defaults", "Reset all values to startup defaults",
OpenPOWER on IntegriCloud