summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/package.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/package.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/package.c')
-rw-r--r--usr.sbin/sysinstall/package.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index 185956f..caefc82 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -41,7 +41,7 @@
#include <sys/mount.h>
#include <sys/stat.h>
-static Boolean sigpipe_caught;
+static Boolean sigpipe_caught = FALSE;
static void
catch_pipe(int sig)
@@ -60,14 +60,9 @@ package_add(char *name)
if (!mediaVerify())
return DITEM_FAILURE;
-
- if (!mediaDevice->init(mediaDevice))
- return DITEM_FAILURE;
-
i = index_initialize("packages/INDEX");
if (DITEM_STATUS(i) != DITEM_SUCCESS)
return i;
-
tmp3 = strpbrk(name, "-") ? NULL : &tmp2;
tmp = index_search(&Top, name, tmp3);
if (tmp)
OpenPOWER on IntegriCloud