Add a registration screen so we can finally start counting our little user

puppies.

17 files changed, 76 insertions, 29 deletions

diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 1b2762e..0eb723b 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -7,10 +7,10 @@ CLEANFILES+=	keymap.tmp keymap.h
 .PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
 
 SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
-	disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c ftp.c \
-	globals.c index.c install.c installUpgrade.c \
-	keymap.c label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
-	msg.c network.c nfs.c options.c package.c samba.c system.c \
+	disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c \
+	ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
+	label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
+	msg.c network.c nfs.c options.c package.c register.c samba.c system.c \
 	tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
 	uc_eisa.c uc_isa.c uc_kmem.c uc_list.c uc_main.c uc_pci.c \
 	uc_scsi.c keymap.h
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index f2300fd..ccf21a5 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.83 1997/02/22 14:11:16 peter Exp $
+ * $Id: config.c,v 1.84 1997/03/08 12:57:40 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -449,6 +449,12 @@ configSaverTimeout(dialogMenuItem *self)
 }
 
 int
+configRegister(dialogMenuItem *self)
+{
+    return DITEM_STATUS(registerOpenDialog()) | DITEM_RESTORE;
+}
+
+int
 configNTP(dialogMenuItem *self)
 {
     int status;
diff --git a/usr.sbin/sade/dispatch.c b/usr.sbin/sade/dispatch.c
index 034a7f5..5e7ba53 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$
+ * $Id: dispatch.c,v 1.10 1997/02/22 14:11:26 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -48,6 +48,7 @@ static struct _word {
     { "configRouter",		configRouter		},
     { "configNFSServer",	configNFSServer		},
     { "configSamba",		configSamba		},
+    { "configRegister",		configRegister		},
     { "configPackages",		configPackages		},
     { "diskPartitionEditor",	diskPartitionEditor	},
     { "diskPartitionWrite",	diskPartitionWrite	},
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 1eeafe9..c642e4f 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.174 1997/03/08 12:57:43 jkh Exp $
+ * $Id: install.c,v 1.175 1997/03/08 16:17:46 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -593,6 +593,15 @@ installNovice(dialogMenuItem *self)
 	restorescr(w);
     }
 
+    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"
+		  "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"
+		  "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."))
+	configRegister(NULL);
+
     /* XXX Put whatever other nice configuration questions you'd like to ask the user here XXX */
 
     /* Give user the option of one last configuration spree */
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 169b906..4d0f08c 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.119 1997/02/22 14:12:05 peter Exp $
+ * $Id: menus.c,v 1.120 1997/03/08 12:57:45 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -257,6 +257,8 @@ DMenu MenuIndex = {
       { "Packages",		"The packages collection",		NULL, configPackages },
       { "Partition",		"The disk Partition Editor",		NULL, diskPartitionEditor },
       { "PCNFSD",		"Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
+      { "Register",		"Register yourself or company as a FreeBSD user.", dmenuVarCheck, configRegister, NULL, "registered" },
+      { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
       { "Router",		"Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
       { "Samba",		"Configure Samba for LanManager access.", dmenuVarCheck, configSamba, NULL, "samba" },
@@ -1059,7 +1061,7 @@ DMenu MenuConfigure = {
 	NULL,	dmenuSystemCommand, NULL, "passwd root" },
       { "A HTML Docs",	"Go to the HTML documentation menu (post-install)",
 	NULL, docBrowser },
-      { "B XFree86",	"Configure XFree86",
+      { "X XFree86",	"Configure XFree86",
 	NULL, configXFree86 },
       { "D Distributions", "Install additional distribution sets",
 	NULL, distExtractAll },
@@ -1067,7 +1069,9 @@ DMenu MenuConfigure = {
 	NULL, diskLabelEditor },
       { "Partition",	"The disk Partition Editor",
 	NULL, diskPartitionEditor },
-      { "Exit",		"Exit this menu (returning to previous)",
+      { "S Set Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
+      { "R Register",	"Register yourself or company as a FreeBSD user.", NULL, configRegister },
+      { "E Exit",		"Exit this menu (returning to previous)",
 	NULL,	dmenuExit },
       { NULL } },
 };
diff --git a/usr.sbin/sade/misc.c b/usr.sbin/sade/misc.c
index 028018e..6670d52 100644
--- a/usr.sbin/sade/misc.c
+++ b/usr.sbin/sade/misc.c
@@ -1,7 +1,7 @@
 /*
  * Miscellaneous support routines..
  *
- * $Id$
+ * $Id: misc.c,v 1.32 1997/02/22 14:12:08 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -361,7 +361,7 @@ openLayoutDialog(char *helpfile, char *title, int x, int y, int width, int heigh
 	/* Setup a nice screen for us to splat stuff onto */
 	draw_box(win, y, x, height, width, dialog_attr, border_attr);
 	wattrset(win, dialog_attr);
-	mvwaddstr(win, y, x + 20, title);
+	mvwaddstr(win, y, x + (COLS - strlen(title)) / 2, title);
     }
     return win;
 }
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 45a9971..4b6f249 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.118 1997/02/22 14:12:18 peter Exp $
+ * $Id: sysinstall.h,v 1.119 1997/03/08 11:06:43 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -407,6 +407,7 @@ extern int	configFstab(void);
 extern void	configEnvironmentSysconfig(char *config);
 extern void	configEnvironmentResolv(char *config);
 extern void	configSysconfig(char *config);
+extern int	configRegister(dialogMenuItem *self);
 extern void	configResolv(void);
 extern int	configPackages(dialogMenuItem *self);
 extern int	configSaver(dialogMenuItem *self);
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 1b2762e..0eb723b 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -7,10 +7,10 @@ CLEANFILES+=	keymap.tmp keymap.h
 .PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
 
 SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
-	disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c ftp.c \
-	globals.c index.c install.c installUpgrade.c \
-	keymap.c label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
-	msg.c network.c nfs.c options.c package.c samba.c system.c \
+	disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c \
+	ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
+	label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
+	msg.c network.c nfs.c options.c package.c register.c samba.c system.c \
 	tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
 	uc_eisa.c uc_isa.c uc_kmem.c uc_list.c uc_main.c uc_pci.c \
 	uc_scsi.c keymap.h
diff --git a/usr.sbin/sysinstall/anonFTP.c b/usr.sbin/sysinstall/anonFTP.c
index 699e1f6..9171232 100644
--- a/usr.sbin/sysinstall/anonFTP.c
+++ b/usr.sbin/sysinstall/anonFTP.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id$
+ * $Id: anonFTP.c,v 1.21 1997/02/07 04:25:16 jkh Exp $
  *
  * Copyright (c) 1995
  *	Coranth Gryphon.  All rights reserved.
@@ -224,6 +224,7 @@ anonftpOpenDialog(void)
     while (layoutDialogLoop(ds_win, layout, &obj, &n, max, &cancelbutton, &cancel));
 
     /* Clear this crap off the screen */
+    delwin(ds_win);
     dialog_clear_norefresh();
     use_helpfile(NULL);
     
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index f2300fd..ccf21a5 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.83 1997/02/22 14:11:16 peter Exp $
+ * $Id: config.c,v 1.84 1997/03/08 12:57:40 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -449,6 +449,12 @@ configSaverTimeout(dialogMenuItem *self)
 }
 
 int
+configRegister(dialogMenuItem *self)
+{
+    return DITEM_STATUS(registerOpenDialog()) | DITEM_RESTORE;
+}
+
+int
 configNTP(dialogMenuItem *self)
 {
     int status;
diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c
index 034a7f5..5e7ba53 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$
+ * $Id: dispatch.c,v 1.10 1997/02/22 14:11:26 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -48,6 +48,7 @@ static struct _word {
     { "configRouter",		configRouter		},
     { "configNFSServer",	configNFSServer		},
     { "configSamba",		configSamba		},
+    { "configRegister",		configRegister		},
     { "configPackages",		configPackages		},
     { "diskPartitionEditor",	diskPartitionEditor	},
     { "diskPartitionWrite",	diskPartitionWrite	},
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 1eeafe9..c642e4f 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/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.174 1997/03/08 12:57:43 jkh Exp $
+ * $Id: install.c,v 1.175 1997/03/08 16:17:46 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -593,6 +593,15 @@ installNovice(dialogMenuItem *self)
 	restorescr(w);
     }
 
+    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"
+		  "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"
+		  "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."))
+	configRegister(NULL);
+
     /* XXX Put whatever other nice configuration questions you'd like to ask the user here XXX */
 
     /* Give user the option of one last configuration spree */
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 169b906..4d0f08c 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/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.119 1997/02/22 14:12:05 peter Exp $
+ * $Id: menus.c,v 1.120 1997/03/08 12:57:45 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -257,6 +257,8 @@ DMenu MenuIndex = {
       { "Packages",		"The packages collection",		NULL, configPackages },
       { "Partition",		"The disk Partition Editor",		NULL, diskPartitionEditor },
       { "PCNFSD",		"Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
+      { "Register",		"Register yourself or company as a FreeBSD user.", dmenuVarCheck, configRegister, NULL, "registered" },
+      { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
       { "Router",		"Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
       { "Samba",		"Configure Samba for LanManager access.", dmenuVarCheck, configSamba, NULL, "samba" },
@@ -1059,7 +1061,7 @@ DMenu MenuConfigure = {
 	NULL,	dmenuSystemCommand, NULL, "passwd root" },
       { "A HTML Docs",	"Go to the HTML documentation menu (post-install)",
 	NULL, docBrowser },
-      { "B XFree86",	"Configure XFree86",
+      { "X XFree86",	"Configure XFree86",
 	NULL, configXFree86 },
       { "D Distributions", "Install additional distribution sets",
 	NULL, distExtractAll },
@@ -1067,7 +1069,9 @@ DMenu MenuConfigure = {
 	NULL, diskLabelEditor },
       { "Partition",	"The disk Partition Editor",
 	NULL, diskPartitionEditor },
-      { "Exit",		"Exit this menu (returning to previous)",
+      { "S Set Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
+      { "R Register",	"Register yourself or company as a FreeBSD user.", NULL, configRegister },
+      { "E Exit",		"Exit this menu (returning to previous)",
 	NULL,	dmenuExit },
       { NULL } },
 };
diff --git a/usr.sbin/sysinstall/misc.c b/usr.sbin/sysinstall/misc.c
index 028018e..6670d52 100644
--- a/usr.sbin/sysinstall/misc.c
+++ b/usr.sbin/sysinstall/misc.c
@@ -1,7 +1,7 @@
 /*
  * Miscellaneous support routines..
  *
- * $Id$
+ * $Id: misc.c,v 1.32 1997/02/22 14:12:08 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -361,7 +361,7 @@ openLayoutDialog(char *helpfile, char *title, int x, int y, int width, int heigh
 	/* Setup a nice screen for us to splat stuff onto */
 	draw_box(win, y, x, height, width, dialog_attr, border_attr);
 	wattrset(win, dialog_attr);
-	mvwaddstr(win, y, x + 20, title);
+	mvwaddstr(win, y, x + (COLS - strlen(title)) / 2, title);
     }
     return win;
 }
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 45a9971..4b6f249 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.118 1997/02/22 14:12:18 peter Exp $
+ * $Id: sysinstall.h,v 1.119 1997/03/08 11:06:43 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -407,6 +407,7 @@ extern int	configFstab(void);
 extern void	configEnvironmentSysconfig(char *config);
 extern void	configEnvironmentResolv(char *config);
 extern void	configSysconfig(char *config);
+extern int	configRegister(dialogMenuItem *self);
 extern void	configResolv(void);
 extern int	configPackages(dialogMenuItem *self);
 extern int	configSaver(dialogMenuItem *self);
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c
index 77361ed..c6ac750 100644
--- a/usr.sbin/sysinstall/tcpip.c
+++ b/usr.sbin/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: tcpip.c,v 1.64 1997/02/22 14:12:23 peter Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
@@ -168,6 +168,7 @@ tcpOpenDialog(Device *devp)
 				    TCP_DIALOG_X, TCP_DIALOG_Y, TCP_DIALOG_WIDTH, TCP_DIALOG_HEIGHT))) {
 	beep();
 	msgConfirm("Cannot open TCP/IP dialog window!!");
+	restorescr(save);
 	return DITEM_FAILURE;
     }
 
@@ -259,6 +260,7 @@ reenter:
 	goto reenter;
 
     /* Clear this crap off the screen */
+    delwin(ds_win);
     dialog_clear_norefresh();
     use_helpfile(NULL);
 
diff --git a/usr.sbin/sysinstall/user.c b/usr.sbin/sysinstall/user.c
index 2a47352..680a543 100644
--- a/usr.sbin/sysinstall/user.c
+++ b/usr.sbin/sysinstall/user.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: user.c,v 1.13 1997/02/22 14:12:36 peter Exp $
  *
  * Copyright (c) 1996
  *      Jörg Wunsch. All rights reserved.
@@ -381,6 +381,7 @@ reenter:
 	goto reenter;
 
     /* Clear this crap off the screen */
+    delwin(ds_win);
     dialog_clear_norefresh();
     use_helpfile(NULL);
 
@@ -710,6 +711,7 @@ reenter:
 	goto reenter;
 
     /* Clear this crap off the screen */
+    delwin(ds_win);
     dialog_clear_norefresh();
     use_helpfile(NULL);