mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-17 15:27:36 +00:00
Code Issues Releases Activity

1. Add MBR type menu to take it off of Poul's "gripe sheet".

Browse Source 
2. Syntax correction from Andrey.

Good night! :-)
This commit is contained in:
Jordan K. Hubbard 1995-05-20 20:30:12 +00:00
parent cc1f1b8814
commit 6593420ad1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=8660
9 changed files with 117 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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.41 1995/05/20 19:12:11 phk Exp $
* $Id: install.c,v 1.42 1995/05/20 19:22:20 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -84,20 +84,26 @@ installInitial(void)
Device **devs;
int i;
static Boolean alreadyDone = FALSE;
char *cp;
if (alreadyDone)
return;
dmenuOpenSimple(&MenuMBRType);
mbrContents = NULL;
cp = getenv("bootManager");
if (cp) {
if (!strcmp(cp, "bteasy"))
mbrContents = bteasy17;
else if (!strcmp(cp, "mbr"))
mbrContents = mbr;
}
/* If things aren't kosher, or we refuse to proceed, bail. */
if (!preInstallCheck()
|| msgYesNo("Last Chance! Are you SURE you want continue the installation?\n\nIf you're running this on an existing system, we STRONGLY\nencourage you to make proper backups before proceeding.\nWe take no responsibility for lost disk contents!"))
return;
mbrContents = NULL;
if (!msgYesNo("Would you like to install a boot manager?\n\nThis will allow you to easily select between other operating systems\non the first disk, or boot from a disk other than the first."))
mbrContents = bteasy17;
else if (!msgYesNo("Would you like to remove an existing boot manager?"))
mbrContents = mbr;
devs = deviceFind(NULL, DEVICE_TYPE_DISK);
for (i = 0; devs[i]; i++) {
Disk *d = (Disk *)devs[i]->private;

27
release/sysinstall/menus.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: menus.c,v 1.20 1995/05/20 10:33:08 jkh Exp $
* $Id: menus.c,v 1.21 1995/05/20 13:36:44 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -137,7 +137,7 @@ to be in experimental status at this time.", /* prompt */
DMENU_CALL, (void *)lang_set_Japanese, 0, 0 },
{ "Norwegian", "Norwegian language and character set (ISO-8859-1)", /* N */
DMENU_CALL, (void *)lang_set_Norwegian, 0, 0 },
{ "Russian", "Russian language and character set (CP866)", /* R */
{ "Russian", "Russian language and character set (KOI8-R)", /* R */
DMENU_CALL, (void *)lang_set_Russian, 0, 0 },
{ "Spanish", "Spanish language and character set (ISO-8859-1)", /* S */
DMENU_CALL, (void *)lang_set_Spanish, 0, 0 },
@ -575,3 +575,26 @@ at this time then select Cancel to leave this menu.",
DMENU_CALL, (void *)installCommit, 0, 0 },
{ NULL } },
};
/* MBR type menu */
DMenu MenuMBRType = {
DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
"Chose boot manager type", /* title */
"FreeBSD comes with a boot selector that allows you to easily\n\
select between FreeBSD and other operating systems on your machine\n\
at boot time. If you have more than one drive and wish to boot\n\
from other than the first, the boot selector will also allow you\n\
to do so (limitations in the PC boot-BIOS usually prevent this\n\
otherwise). If you do not want a boot selector, or wish to replace\n\
an existing one, select \"standard\". If you would prefer your master\n\
boot record to be untouched, then select \"none\".",
"Press F1 to read the installation guide",
"install.hlp",
{ { "BootMgr", "Install the FreeBSD Boot Manager (\"Booteasy\")", /* B */
DMENU_SET_VARIABLE, (void *)"bootManager=bteasy", 0, 0 },
{ "Standard", "Use a standard MBR (no boot manager)", /* S */
DMENU_SET_VARIABLE, (void *)"bootManager=mbr", 0, 0 },
{ "None", "Leave the Master Boot Record untouched", /* N */
DMENU_CALL, (void *)diskPartitionEditor, 0, 0 },
{ NULL } },
};

3
release/sysinstall/sysinstall.h
View File

@ -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.23 1995/05/20 10:33:11 jkh Exp $
* $Id: sysinstall.h,v 1.24 1995/05/20 11:10:35 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -193,6 +193,7 @@ extern unsigned int XF86ServerDists; /* The XFree86 servers we want */
extern unsigned int XF86FontDists; /* The XFree86 fonts we want */
extern DMenu MenuInitial; /* Initial installation menu */
extern DMenu MenuMBRType; /* Type of MBR to write on the disk */
extern DMenu MenuDocumentation; /* Documentation menu */
extern DMenu MenuOptions; /* Installation options */
extern DMenu MenuOptionsLanguage; /* Language options menu */

18
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.41 1995/05/20 19:12:11 phk Exp $
* $Id: install.c,v 1.42 1995/05/20 19:22:20 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -84,20 +84,26 @@ installInitial(void)
Device **devs;
int i;
static Boolean alreadyDone = FALSE;
char *cp;
if (alreadyDone)
return;
dmenuOpenSimple(&MenuMBRType);
mbrContents = NULL;
cp = getenv("bootManager");
if (cp) {
if (!strcmp(cp, "bteasy"))
mbrContents = bteasy17;
else if (!strcmp(cp, "mbr"))
mbrContents = mbr;
}
/* If things aren't kosher, or we refuse to proceed, bail. */
if (!preInstallCheck()
|| msgYesNo("Last Chance! Are you SURE you want continue the installation?\n\nIf you're running this on an existing system, we STRONGLY\nencourage you to make proper backups before proceeding.\nWe take no responsibility for lost disk contents!"))
return;
mbrContents = NULL;
if (!msgYesNo("Would you like to install a boot manager?\n\nThis will allow you to easily select between other operating systems\non the first disk, or boot from a disk other than the first."))
mbrContents = bteasy17;
else if (!msgYesNo("Would you like to remove an existing boot manager?"))
mbrContents = mbr;
devs = deviceFind(NULL, DEVICE_TYPE_DISK);
for (i = 0; devs[i]; i++) {
Disk *d = (Disk *)devs[i]->private;

27
usr.sbin/sade/menus.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: menus.c,v 1.20 1995/05/20 10:33:08 jkh Exp $
* $Id: menus.c,v 1.21 1995/05/20 13:36:44 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -137,7 +137,7 @@ to be in experimental status at this time.", /* prompt */
DMENU_CALL, (void *)lang_set_Japanese, 0, 0 },
{ "Norwegian", "Norwegian language and character set (ISO-8859-1)", /* N */
DMENU_CALL, (void *)lang_set_Norwegian, 0, 0 },
{ "Russian", "Russian language and character set (CP866)", /* R */
{ "Russian", "Russian language and character set (KOI8-R)", /* R */
DMENU_CALL, (void *)lang_set_Russian, 0, 0 },
{ "Spanish", "Spanish language and character set (ISO-8859-1)", /* S */
DMENU_CALL, (void *)lang_set_Spanish, 0, 0 },
@ -575,3 +575,26 @@ at this time then select Cancel to leave this menu.",
DMENU_CALL, (void *)installCommit, 0, 0 },
{ NULL } },
};
/* MBR type menu */
DMenu MenuMBRType = {
DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
"Chose boot manager type", /* title */
"FreeBSD comes with a boot selector that allows you to easily\n\
select between FreeBSD and other operating systems on your machine\n\
at boot time. If you have more than one drive and wish to boot\n\
from other than the first, the boot selector will also allow you\n\
to do so (limitations in the PC boot-BIOS usually prevent this\n\
otherwise). If you do not want a boot selector, or wish to replace\n\
an existing one, select \"standard\". If you would prefer your master\n\
boot record to be untouched, then select \"none\".",
"Press F1 to read the installation guide",
"install.hlp",
{ { "BootMgr", "Install the FreeBSD Boot Manager (\"Booteasy\")", /* B */
DMENU_SET_VARIABLE, (void *)"bootManager=bteasy", 0, 0 },
{ "Standard", "Use a standard MBR (no boot manager)", /* S */
DMENU_SET_VARIABLE, (void *)"bootManager=mbr", 0, 0 },
{ "None", "Leave the Master Boot Record untouched", /* N */
DMENU_CALL, (void *)diskPartitionEditor, 0, 0 },
{ NULL } },
};

3
usr.sbin/sade/sade.h
View File

@ -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.23 1995/05/20 10:33:11 jkh Exp $
* $Id: sysinstall.h,v 1.24 1995/05/20 11:10:35 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -193,6 +193,7 @@ extern unsigned int XF86ServerDists; /* The XFree86 servers we want */
extern unsigned int XF86FontDists; /* The XFree86 fonts we want */
extern DMenu MenuInitial; /* Initial installation menu */
extern DMenu MenuMBRType; /* Type of MBR to write on the disk */
extern DMenu MenuDocumentation; /* Documentation menu */
extern DMenu MenuOptions; /* Installation options */
extern DMenu MenuOptionsLanguage; /* Language options menu */

18
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.41 1995/05/20 19:12:11 phk Exp $
* $Id: install.c,v 1.42 1995/05/20 19:22:20 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -84,20 +84,26 @@ installInitial(void)
Device **devs;
int i;
static Boolean alreadyDone = FALSE;
char *cp;
if (alreadyDone)
return;
dmenuOpenSimple(&MenuMBRType);
mbrContents = NULL;
cp = getenv("bootManager");
if (cp) {
if (!strcmp(cp, "bteasy"))
mbrContents = bteasy17;
else if (!strcmp(cp, "mbr"))
mbrContents = mbr;
}
/* If things aren't kosher, or we refuse to proceed, bail. */
if (!preInstallCheck()
|| msgYesNo("Last Chance! Are you SURE you want continue the installation?\n\nIf you're running this on an existing system, we STRONGLY\nencourage you to make proper backups before proceeding.\nWe take no responsibility for lost disk contents!"))
return;
mbrContents = NULL;
if (!msgYesNo("Would you like to install a boot manager?\n\nThis will allow you to easily select between other operating systems\non the first disk, or boot from a disk other than the first."))
mbrContents = bteasy17;
else if (!msgYesNo("Would you like to remove an existing boot manager?"))
mbrContents = mbr;
devs = deviceFind(NULL, DEVICE_TYPE_DISK);
for (i = 0; devs[i]; i++) {
Disk *d = (Disk *)devs[i]->private;

27
usr.sbin/sysinstall/menus.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: menus.c,v 1.20 1995/05/20 10:33:08 jkh Exp $
* $Id: menus.c,v 1.21 1995/05/20 13:36:44 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -137,7 +137,7 @@ to be in experimental status at this time.", /* prompt */
DMENU_CALL, (void *)lang_set_Japanese, 0, 0 },
{ "Norwegian", "Norwegian language and character set (ISO-8859-1)", /* N */
DMENU_CALL, (void *)lang_set_Norwegian, 0, 0 },
{ "Russian", "Russian language and character set (CP866)", /* R */
{ "Russian", "Russian language and character set (KOI8-R)", /* R */
DMENU_CALL, (void *)lang_set_Russian, 0, 0 },
{ "Spanish", "Spanish language and character set (ISO-8859-1)", /* S */
DMENU_CALL, (void *)lang_set_Spanish, 0, 0 },
@ -575,3 +575,26 @@ at this time then select Cancel to leave this menu.",
DMENU_CALL, (void *)installCommit, 0, 0 },
{ NULL } },
};
/* MBR type menu */
DMenu MenuMBRType = {
DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
"Chose boot manager type", /* title */
"FreeBSD comes with a boot selector that allows you to easily\n\
select between FreeBSD and other operating systems on your machine\n\
at boot time. If you have more than one drive and wish to boot\n\
from other than the first, the boot selector will also allow you\n\
to do so (limitations in the PC boot-BIOS usually prevent this\n\
otherwise). If you do not want a boot selector, or wish to replace\n\
an existing one, select \"standard\". If you would prefer your master\n\
boot record to be untouched, then select \"none\".",
"Press F1 to read the installation guide",
"install.hlp",
{ { "BootMgr", "Install the FreeBSD Boot Manager (\"Booteasy\")", /* B */
DMENU_SET_VARIABLE, (void *)"bootManager=bteasy", 0, 0 },
{ "Standard", "Use a standard MBR (no boot manager)", /* S */
DMENU_SET_VARIABLE, (void *)"bootManager=mbr", 0, 0 },
{ "None", "Leave the Master Boot Record untouched", /* N */
DMENU_CALL, (void *)diskPartitionEditor, 0, 0 },
{ NULL } },
};

3
usr.sbin/sysinstall/sysinstall.h
View File

@ -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.23 1995/05/20 10:33:11 jkh Exp $
* $Id: sysinstall.h,v 1.24 1995/05/20 11:10:35 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -193,6 +193,7 @@ extern unsigned int XF86ServerDists; /* The XFree86 servers we want */
extern unsigned int XF86FontDists; /* The XFree86 fonts we want */
extern DMenu MenuInitial; /* Initial installation menu */
extern DMenu MenuMBRType; /* Type of MBR to write on the disk */
extern DMenu MenuDocumentation; /* Documentation menu */
extern DMenu MenuOptions; /* Installation options */
extern DMenu MenuOptionsLanguage; /* Language options menu */