diff options
| author | jkh <jkh@FreeBSD.org> | 1995-10-22 11:32:58 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1995-10-22 11:32:58 +0000 |
| commit | 938267d18f1606e4a0dafcd63d54d7a47825a046 (patch) | |
| tree | 587043b86d62ca0d41368f528d7a7bea48bd3ee4 | |
| parent | 2c6ce482119b02cd4ece1d38533f8abfc7da4b25 (diff) | |
| download | FreeBSD-src-938267d18f1606e4a0dafcd63d54d7a47825a046.zip FreeBSD-src-938267d18f1606e4a0dafcd63d54d7a47825a046.tar.gz | |
Fix a bug in dist extraction when a dist was missing.
Allow instrumentation for adding packages from scripts.
| -rw-r--r-- | release/sysinstall/installPreconfig.c | 3 | ||||
| -rw-r--r-- | release/sysinstall/package.c | 11 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/package.c | 11 |
3 files changed, 22 insertions, 3 deletions
diff --git a/release/sysinstall/installPreconfig.c b/release/sysinstall/installPreconfig.c index 41940f5..392c7ba 100644 --- a/release/sysinstall/installPreconfig.c +++ b/release/sysinstall/installPreconfig.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: installPreconfig.c,v 1.5 1995/10/22 01:32:47 jkh Exp $ + * $Id: installPreconfig.c,v 1.6 1995/10/22 10:25:20 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -97,6 +97,7 @@ static struct _word { { "mediaSetFtpUserPass", mediaSetFtpUserPass }, { "mediaSetCPIOVerbosity", mediaSetCPIOVerbosity }, { "mediaGetType", mediaGetType }, + { "packageAdd", package_add }, { "tcpInstallDevice", tcpInstallDevice }, { NULL, NULL }, }; diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c index c2eb285..6e55c94 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.8 1995/10/21 20:03:07 jkh Exp $ + * $Id: package.c,v 1.9 1995/10/22 01:32:58 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -52,6 +52,15 @@ static char *make_playpen(char *pen, size_t sz); +/* Like package_extract, but assumes current media device */ +int +package_add(char *name) +{ + if (!mediaVerify()) + return RET_FAIL; + return package_extract(mediaDevice, name); +} + /* Extract a package based on a namespec and a media device */ int package_extract(Device *dev, char *name) diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c index c2eb285..6e55c94 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.8 1995/10/21 20:03:07 jkh Exp $ + * $Id: package.c,v 1.9 1995/10/22 01:32:58 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -52,6 +52,15 @@ static char *make_playpen(char *pen, size_t sz); +/* Like package_extract, but assumes current media device */ +int +package_add(char *name) +{ + if (!mediaVerify()) + return RET_FAIL; + return package_extract(mediaDevice, name); +} + /* Extract a package based on a namespec and a media device */ int package_extract(Device *dev, char *name) |
