summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/index.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1999-09-01 04:29:30 +0000
committerjkh <jkh@FreeBSD.org>1999-09-01 04:29:30 +0000
commit2fdb12ea191206861f3cd9bf3a0d8ba85dd96aae (patch)
tree629d137afaab5d765bfc0fc21e0220e1f8acb9c7 /usr.sbin/sysinstall/index.c
parent73a7a67d13cba01eb39397ff54125ce8d3e6f8cc (diff)
downloadFreeBSD-src-2fdb12ea191206861f3cd9bf3a0d8ba85dd96aae.zip
FreeBSD-src-2fdb12ea191206861f3cd9bf3a0d8ba85dd96aae.tar.gz
MFC: Catch 3.2-stable sysinstall up to 4.0-current level functionality,
bringing in DHCP support. The only thing I left out were Poul-Henning's newfs changes since I'm not sure if he's brought the rest of that support into -stable yet. If it turns out that this is the case, I'll MFC those changes too.
Diffstat (limited to 'usr.sbin/sysinstall/index.c')
-rw-r--r--usr.sbin/sysinstall/index.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c
index 947385a..23e49da 100644
--- a/usr.sbin/sysinstall/index.c
+++ b/usr.sbin/sysinstall/index.c
@@ -102,9 +102,7 @@ static char *descrs[] = {
"german", "Ported software for Germanic countries.",
"graphics", "Graphics libraries and utilities.",
"gnome", "Components of the Gnome Desktop environment.",
- "irc", "Internet Relay Chat utilities.",
"japanese", "Ported software for the Japanese market.",
- "java", "Java language support.",
"kde", "Software for the K Desktop Environment.",
"korean", "Ported software for the Korean market.",
"lang", "Computer languages.",
@@ -148,7 +146,6 @@ static char *descrs[] = {
"x11-clocks", "X Window System based clocks.",
"x11-fm", "X Window System based file managers.",
"x11-fonts", "X Window System fonts and font utilities.",
- "x11-servers", "X Window System servers.",
"x11-toolkits", "X Window System based development toolkits.",
"x11-wm", "X Window System window managers.",
NULL, NULL,
@@ -420,6 +417,7 @@ index_search(PkgNodePtr top, char *str, PkgNodePtr *tp)
*tp = top;
return p;
}
+
}
else if (p->kids) {
/* The usual recursion-out-of-laziness ploy */
OpenPOWER on IntegriCloud