d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Leave hints for pkg_add so that it can do dependency over FTP. This

Browse Source 
was formerly impossible due to the way pkg_add was insulated from where
a package actually came from.
This commit is contained in:
Jordan K. Hubbard 1995-11-10 06:49:03 +00:00
parent 56d73bb085
commit cf01259085
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
release/sysinstall/package.c
View File

@ -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.22 1995/10/27 03:07:14 jkh Exp $
* $Id: package.c,v 1.23 1995/11/06 12:49:27 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -97,6 +97,13 @@ package_extract(Device *dev, char *name)
if ((where = make_playpen(pen, 0)) != NULL) {
if (mediaExtractDist(pen, fd)) {
if (file_readable("+CONTENTS")) {
if (mediaDevice->type == DEVICE_TYPE_FTP && variable_get(VAR_FTP_PATH)) {
char ftppath[512];
/* Special case to leave hint for pkg_add that this is an FTP install */
sprintf(ftppath, "%spackages/All/", variable_get(VAR_FTP_PATH));
variable_set2("PKG_ADD_BASE", ftppath);
}
if (vsystem("(pwd; cat +CONTENTS) | pkg_add %s-S",
!strcmp(variable_get(VAR_CPIO_VERBOSITY), "high") ? "-v " : "")) {
dialog_clear();

9
usr.sbin/sysinstall/package.c
View File

@ -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.22 1995/10/27 03:07:14 jkh Exp $
* $Id: package.c,v 1.23 1995/11/06 12:49:27 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -97,6 +97,13 @@ package_extract(Device *dev, char *name)
if ((where = make_playpen(pen, 0)) != NULL) {
if (mediaExtractDist(pen, fd)) {
if (file_readable("+CONTENTS")) {
if (mediaDevice->type == DEVICE_TYPE_FTP && variable_get(VAR_FTP_PATH)) {
char ftppath[512];
/* Special case to leave hint for pkg_add that this is an FTP install */
sprintf(ftppath, "%spackages/All/", variable_get(VAR_FTP_PATH));
variable_set2("PKG_ADD_BASE", ftppath);
}
if (vsystem("(pwd; cat +CONTENTS) | pkg_add %s-S",
!strcmp(variable_get(VAR_CPIO_VERBOSITY), "high") ? "-v " : "")) {
dialog_clear();