d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fstab sequence number bug.

Browse Source 
Add a few more strategic screen clears.
Fix registration form bug.
This commit is contained in:
Jordan K. Hubbard 1997-08-18 21:47:34 +00:00
parent 606b60ca2f
commit ea2b79b03e
7 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/sysinstall/config.c
View File

@ -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.101 1997/06/21 15:45:07 jkh Exp $
* $Id: config.c,v 1.102 1997/08/17 10:08:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -167,8 +167,10 @@ seq_num(Chunk *c1)
if (c1->type == part && c1->subtype != FS_SWAP) {
if (rootdev_is_od == 0 && strncmp(c1->name, "od", 2) == 0)
return 0;
else
else if (c1->flags & CHUNK_IS_ROOT)
return 1;
else
return 2;
}
return 0;
}

7
release/sysinstall/install.c
View File

@ -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.194 1997/07/16 15:21:57 jkh Exp $
* $Id: install.c,v 1.195 1997/07/23 15:13:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -604,14 +604,17 @@ installNovice(dialogMenuItem *self)
"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.\n"))
configRegister(NULL);
else
else {
dialog_clear_norefresh();
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 */
/* Give user the option of one last configuration spree */
dialog_clear_norefresh();
installConfigure();
return DITEM_LEAVE_MENU | DITEM_RESTORE;

6
release/sysinstall/register.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: register.c,v 1.6 1997/03/25 03:07:46 jkh Exp $
* $Id: register.c,v 1.7 1997/05/26 04:57:56 jkh Exp $
*
* Copyright (c) 1997
* Jordan Hubbard. All rights reserved.
@ -178,6 +178,7 @@ handle_registration(void)
fprintf(fp, "<version>%s</version>\n", RELEASE_NAME);
fprintf(fp, "</entry>\n");
fclose(fp);
dialog_clear_norefresh();
if (!msgYesNo("Do you have a working network connection and outgoing email\n"
"enabled at this time? I need to be able to reach freebsd.org\n"
"in order to submit your registration.")) {
@ -339,7 +340,8 @@ registerOpenDialog(void)
goto reenter;
/* OK, we've got a valid registration, now push it out */
handle_registration();
if (!cancel)
handle_registration();
/* Clear this crap off the screen */
delwin(ds_win);

6
usr.sbin/sade/config.c
View File

@ -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.101 1997/06/21 15:45:07 jkh Exp $
* $Id: config.c,v 1.102 1997/08/17 10:08:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -167,8 +167,10 @@ seq_num(Chunk *c1)
if (c1->type == part && c1->subtype != FS_SWAP) {
if (rootdev_is_od == 0 && strncmp(c1->name, "od", 2) == 0)
return 0;
else
else if (c1->flags & CHUNK_IS_ROOT)
return 1;
else
return 2;
}
return 0;
}

7
usr.sbin/sade/install.c
View File

@ -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.194 1997/07/16 15:21:57 jkh Exp $
* $Id: install.c,v 1.195 1997/07/23 15:13:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -604,14 +604,17 @@ installNovice(dialogMenuItem *self)
"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.\n"))
configRegister(NULL);
else
else {
dialog_clear_norefresh();
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 */
/* Give user the option of one last configuration spree */
dialog_clear_norefresh();
installConfigure();
return DITEM_LEAVE_MENU | DITEM_RESTORE;

6
usr.sbin/sysinstall/config.c
View File

@ -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.101 1997/06/21 15:45:07 jkh Exp $
* $Id: config.c,v 1.102 1997/08/17 10:08:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -167,8 +167,10 @@ seq_num(Chunk *c1)
if (c1->type == part && c1->subtype != FS_SWAP) {
if (rootdev_is_od == 0 && strncmp(c1->name, "od", 2) == 0)
return 0;
else
else if (c1->flags & CHUNK_IS_ROOT)
return 1;
else
return 2;
}
return 0;
}

7
usr.sbin/sysinstall/install.c
View File

@ -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.194 1997/07/16 15:21:57 jkh Exp $
* $Id: install.c,v 1.195 1997/07/23 15:13:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -604,14 +604,17 @@ installNovice(dialogMenuItem *self)
"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.\n"))
configRegister(NULL);
else
else {
dialog_clear_norefresh();
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 */
/* Give user the option of one last configuration spree */
dialog_clear_norefresh();
installConfigure();
return DITEM_LEAVE_MENU | DITEM_RESTORE;