summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/package.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1999-05-12 07:12:01 +0000
committerjkh <jkh@FreeBSD.org>1999-05-12 07:12:01 +0000
commitcca32ec6a9c3142d3c9bb121e01220665f2fa9c6 (patch)
tree60b0b616790c8a1a026a69c5e887cf38254d6d78 /usr.sbin/sysinstall/package.c
parentbc2dddd84f20d168d94bf07cf80ff86c88f14e7a (diff)
downloadFreeBSD-src-cca32ec6a9c3142d3c9bb121e01220665f2fa9c6.zip
FreeBSD-src-cca32ec6a9c3142d3c9bb121e01220665f2fa9c6.tar.gz
Erm, delete the package base hint again. Gotta lay off the crack!
I simply forgot that I'd already proven this to be a "really good idea that unfortunately didn't work at all" the *last* time I tried it. Now I remember. Hmmm. I WILL defeat this evil problem.
Diffstat (limited to 'usr.sbin/sysinstall/package.c')
-rw-r--r--usr.sbin/sysinstall/package.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index f021ce6..31bb9fb 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: package.c,v 1.68 1999/05/07 20:31:36 jkh Exp $
+ * $Id: package.c,v 1.69 1999/05/12 06:11:32 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -99,7 +99,7 @@ package_exists(char *name)
int
package_extract(Device *dev, char *name, Boolean depended)
{
- char tmp[200], path[511];
+ char path[511];
int ret, last_msg = 0;
FILE *fp;
@@ -135,11 +135,7 @@ package_extract(Device *dev, char *name, Boolean depended)
else
sprintf(path, "%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
- /* Set hints for pkg_add */
- snprintf(tmp, sizeof tmp, "%s/Packages/All/", dev->name);
- setenv("PKG_ADD_BASE", tmp, 1);
- if (isDebug())
- msgDebug("Set PKG_ADD_BASE to %s\n", tmp);
+ /* We have a path, call the device strategy routine to get the file */
fp = dev->get(dev, path, TRUE);
if (fp) {
int i = 0, tot, pfd[2];
OpenPOWER on IntegriCloud