summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/package.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1999-09-02 00:51:16 +0000
committerjkh <jkh@FreeBSD.org>1999-09-02 00:51:16 +0000
commit2b983202e6de74a0ad0fc2765f080543e3895b9f (patch)
tree056879bb90e16442c3b7d9bc3de1330e328d93b9 /usr.sbin/sysinstall/package.c
parent3e73f6e0b13a943ed99fc8f5f463a7a251c2e797 (diff)
downloadFreeBSD-src-2b983202e6de74a0ad0fc2765f080543e3895b9f.zip
FreeBSD-src-2b983202e6de74a0ad0fc2765f080543e3895b9f.tar.gz
Oh crud, did I ever screw the pooch! Rather than sync this with -stable,
I backed-out the changes in -current and didn't touch stable at all (I thought I had my patch order reversed, not what actually happened). AIEEE! I can't even blame the crack for this one since I broke my crack pipe a few weeks ago. I think sleep deprivation gets the blame for this one. Medal for noticing this one goes to: Jim Bloom <bloom@acm.org>
Diffstat (limited to 'usr.sbin/sysinstall/package.c')
-rw-r--r--usr.sbin/sysinstall/package.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index caefc82..185956f 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 = FALSE;
+static Boolean sigpipe_caught;
static void
catch_pipe(int sig)
@@ -60,9 +60,14 @@ 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