diff options
Diffstat (limited to 'usr.sbin/sade')
| -rw-r--r-- | usr.sbin/sade/dispatch.c | 3 | ||||
| -rw-r--r-- | usr.sbin/sade/install.c | 12 | ||||
| -rw-r--r-- | usr.sbin/sade/menus.c | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/usr.sbin/sade/dispatch.c b/usr.sbin/sade/dispatch.c index 5e7ba53..bcc587f 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.10 1997/02/22 14:11:26 peter Exp $ + * $Id: dispatch.c,v 1.11 1997/03/09 22:25:43 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -86,6 +86,7 @@ static struct _word { { "mediaSetCPIOVerbosity", mediaSetCPIOVerbosity }, { "mediaGetType", mediaGetType }, { "optionsEditor", optionsEditor }, + { "register", configRegister }, /* Alias */ { "addGroup", userAddGroup }, { "addUser", userAddUser }, { "shutdown", _shutdown }, diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index c642e4f..eaa47e2 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.175 1997/03/08 16:17:46 jkh Exp $ + * $Id: install.c,v 1.176 1997/03/09 22:25:44 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -595,12 +595,16 @@ installNovice(dialogMenuItem *self) dialog_clear_norefresh(); if (!msgYesNo("Would you like to register your FreeBSD system at this time?\n\n" - "PLEASE take just 5 minutes to do this - if we're ever to get any\n" + "PLEASE, take just 5 minutes to do this. If we're ever to get any\n" "significant base of commercial software for FreeBSD, we need to\n" - "be able to provide more information about the size of our user base.\n" + "be able to provide more information about the size of our user community.\n" "This is where your registration can really help us, and you can also\n" - "sign up for the new FreeBSD newsletter (its free!) at the same time.")) + "sign up for the new FreeBSD newsletter (its free!) at the same time.\n")) configRegister(NULL); + else + msgConfirm("OK, but if you should change your mind then you always can register\n" + "later by typing ``/stand/sysinstall register'' or by simply visiting our\n" + "web site at http://www.freebsd.org/register.html"); /* XXX Put whatever other nice configuration questions you'd like to ask the user here XXX */ diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index acffa39..5d31fbe 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.121 1997/03/09 22:25:46 jkh Exp $ + * $Id: menus.c,v 1.122 1997/03/10 19:38:14 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -122,8 +122,10 @@ clearX11Fonts(dialogMenuItem *self) return DITEM_SUCCESS | DITEM_REDRAW; } -#define IS_DEVELOPER(dist, extra) (((dist) == (_DIST_DEVELOPER | (extra))) || ((dist) == (_DIST_DEVELOPER | DIST_DES | (extra)))) -#define IS_USER(dist, extra) (((dist) == (_DIST_USER | (extra))) || ((dist) == (_DIST_USER | DIST_DES | (extra)))) +#define IS_DEVELOPER(dist, extra) ((((dist) & (_DIST_DEVELOPER | (extra))) == (_DIST_DEVELOPER | (extra))) || \ + (((dist) & (_DIST_DEVELOPER | DIST_DES | (extra))) == (_DIST_DEVELOPER | DIST_DES | (extra)))) +#define IS_USER(dist, extra) ((((dist) & (_DIST_USER | (extra))) == (_DIST_USER | (extra))) || \ + (((dist) & (_DIST_USER | DIST_DES | (extra))) == (_DIST_USER | DIST_DES | (extra)))) static int checkDistDeveloper(dialogMenuItem *self) |
