diff options
author | jkh <jkh@FreeBSD.org> | 1997-06-13 17:55:32 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1997-06-13 17:55:32 +0000 |
commit | 8f235bb8bfcc81c8150dabd41d48aa00cbffc3d3 (patch) | |
tree | 427389c702802aeaf0aace56cc902911fbd02421 /usr.sbin | |
parent | ba527a824b74480c2b6d7f14f51051289518d75c (diff) | |
download | FreeBSD-src-8f235bb8bfcc81c8150dabd41d48aa00cbffc3d3.zip FreeBSD-src-8f235bb8bfcc81c8150dabd41d48aa00cbffc3d3.tar.gz |
YAMF22
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/sade/dispatch.c | 3 | ||||
-rw-r--r-- | usr.sbin/sade/sade.h | 3 | ||||
-rw-r--r-- | usr.sbin/sysinstall/dispatch.c | 3 | ||||
-rw-r--r-- | usr.sbin/sysinstall/package.c | 17 | ||||
-rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 3 |
5 files changed, 24 insertions, 5 deletions
diff --git a/usr.sbin/sade/dispatch.c b/usr.sbin/sade/dispatch.c index d071232..0d295b5 100644 --- a/usr.sbin/sade/dispatch.c +++ b/usr.sbin/sade/dispatch.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dispatch.c,v 1.15 1997/06/12 07:35:39 jkh Exp $ + * $Id: dispatch.c,v 1.16 1997/06/13 09:34:10 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -98,6 +98,7 @@ static struct _word { { "mediaGetType", mediaGetType }, { "optionsEditor", optionsEditor }, { "register", configRegister }, /* Alias */ + { "packageAdd", packageAdd }, { "addGroup", userAddGroup }, { "addUser", userAddUser }, { "shutdown", _shutdown }, diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index f876f27..4f60d63 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.132 1997/06/09 01:19:44 jkh Exp $ + * $Id: sysinstall.h,v 1.133 1997/06/13 14:21:21 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -652,6 +652,7 @@ extern void mediaShutdownNFS(Device *dev); extern int optionsEditor(dialogMenuItem *self); /* package.c */ +extern int packageAdd(dialogMenuItem *self); extern int package_add(char *name); extern int package_extract(Device *dev, char *name, Boolean depended); extern Boolean package_exists(char *name); diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c index d071232..0d295b5 100644 --- a/usr.sbin/sysinstall/dispatch.c +++ b/usr.sbin/sysinstall/dispatch.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dispatch.c,v 1.15 1997/06/12 07:35:39 jkh Exp $ + * $Id: dispatch.c,v 1.16 1997/06/13 09:34:10 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -98,6 +98,7 @@ static struct _word { { "mediaGetType", mediaGetType }, { "optionsEditor", optionsEditor }, { "register", configRegister }, /* Alias */ + { "packageAdd", packageAdd }, { "addGroup", userAddGroup }, { "addUser", userAddUser }, { "shutdown", _shutdown }, diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c index 50c0205..ba56291 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.60 1997/03/11 09:29:23 jkh Exp $ + * $Id: package.c,v 1.61 1997/03/22 15:20:51 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -58,6 +58,21 @@ package_add(char *name) return package_extract(mediaDevice, name, FALSE); } +/* For use by dispatch */ +int +packageAdd(dialogMenuItem *self) +{ + char *cp; + + cp = variable_get("package"); + if (!cp) { + msgDebug("packageAdd: No package name passed in package variable\n"); + return DITEM_FAILURE; + } + else + return package_add(cp); +} + Boolean package_exists(char *name) { diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index f876f27..4f60d63 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.132 1997/06/09 01:19:44 jkh Exp $ + * $Id: sysinstall.h,v 1.133 1997/06/13 14:21:21 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -652,6 +652,7 @@ extern void mediaShutdownNFS(Device *dev); extern int optionsEditor(dialogMenuItem *self); /* package.c */ +extern int packageAdd(dialogMenuItem *self); extern int package_add(char *name); extern int package_extract(Device *dev, char *name, Boolean depended); extern Boolean package_exists(char *name); |