From 26e611619027b46ac9aa00e19b02529145ac8a15 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Wed, 12 May 1999 07:12:01 +0000
Subject: [PATCH] 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.
---
 release/sysinstall/package.c  | 10 +++-------
 usr.sbin/sysinstall/package.c | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c
index f021ce61d54b..31bb9fbdff6a 100644
--- a/release/sysinstall/package.c
+++ b/release/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];
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index f021ce61d54b..31bb9fbdff6a 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];