summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1995-10-22 11:32:58 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1995-10-22 11:32:58 +0000
commitc731441db28d77567066b9dec85d10e4081a4401 (patch)
tree587043b86d62ca0d41368f528d7a7bea48bd3ee4
parentf544b2068894e5bf7c28a076ac69d743bdc76b19 (diff)
Notes
-rw-r--r--release/sysinstall/installPreconfig.c3
-rw-r--r--release/sysinstall/package.c11
-rw-r--r--usr.sbin/sysinstall/package.c11
3 files changed, 22 insertions, 3 deletions
diff --git a/release/sysinstall/installPreconfig.c b/release/sysinstall/installPreconfig.c
index 41940f57c2cf..392c7ba9a260 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 c2eb28590f67..6e55c9437ba9 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 c2eb28590f67..6e55c9437ba9 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)