From 2fdb12ea191206861f3cd9bf3a0d8ba85dd96aae Mon Sep 17 00:00:00 2001 From: jkh Date: Wed, 1 Sep 1999 04:29:30 +0000 Subject: 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. --- usr.sbin/sysinstall/index.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'usr.sbin/sysinstall/index.c') 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 */ -- cgit v1.1