mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00
Code Issues Releases Activity

Don't assume fixit media is only either a floppy disk or 2nd CDROM disc

Browse Source 
Reviewed by:	murray
MFC after:	1 week
This commit is contained in:
Brian Somers 2001-10-29 16:17:19 +00:00
parent 4d2c6266cf
commit d80d04cac0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=85692
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/sade/menus.c
View File

@ -302,7 +302,7 @@ DMenu MenuInitial = {
{ "Doc", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
{ "Keymap", "Select keyboard type", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
{ "Options", "View/Set various installation options", NULL, optionsEditor },
{ "Fixit", "Enter repair mode with CDROM/floppy or start shell", NULL, dmenuSubmenu, NULL, &MenuFixit },
{ "Fixit", "Repair mode with CDROM/DVD/floppy or start shell", NULL, dmenuSubmenu, NULL, &MenuFixit },
{ "Upgrade", "Upgrade an existing system", NULL, installUpgrade },
{ "Load Config","Load default install configuration", NULL, dispatch_load_floppy },
{ "Index", "Glossary of functions", NULL, dmenuSubmenu, NULL, &MenuIndex },
@ -1703,16 +1703,16 @@ DMenu MenuFixit = {
DMENU_NORMAL_TYPE,
"Please choose a fixit option",
"There are three ways of going into \"fixit\" mode:\n"
"- you can use the 2nd FreeBSD CDROM, in which case there will be\n"
"- you can use the live filesystem CDROM/DVD, in which case there will be\n"
" full access to the complete set of FreeBSD commands and utilities,\n"
"- you can use the more limited (but perhaps customized) fixit floppy,\n"
"- or you can start an Emergency Holographic Shell now, which is\n"
" limited to the subset of commands that is already available right now.",
"Press F1 for more detailed repair instructions",
"fixit",
{ { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ "2 CDROM", "Use the 2nd \"live\" CDROM from the distribution", NULL, installFixitCDROM },
{ "3 Floppy", "Use a floppy generated from the fixit image", NULL, installFixitFloppy },
{ "4 Shell", "Start an Emergency Holographic Shell", NULL, installFixitHoloShell },
{ { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ "2 CDROM/DVD", "Use the \"live\" filesystem CDROM/DVD", NULL, installFixitCDROM },
{ "3 Floppy", "Use a floppy generated from the fixit image", NULL, installFixitFloppy },
{ "4 Shell", "Start an Emergency Holographic Shell", NULL, installFixitHoloShell },
{ NULL } },
};

12
usr.sbin/sysinstall/menus.c
View File

@ -302,7 +302,7 @@ DMenu MenuInitial = {
{ "Doc", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
{ "Keymap", "Select keyboard type", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
{ "Options", "View/Set various installation options", NULL, optionsEditor },
{ "Fixit", "Enter repair mode with CDROM/floppy or start shell", NULL, dmenuSubmenu, NULL, &MenuFixit },
{ "Fixit", "Repair mode with CDROM/DVD/floppy or start shell", NULL, dmenuSubmenu, NULL, &MenuFixit },
{ "Upgrade", "Upgrade an existing system", NULL, installUpgrade },
{ "Load Config","Load default install configuration", NULL, dispatch_load_floppy },
{ "Index", "Glossary of functions", NULL, dmenuSubmenu, NULL, &MenuIndex },
@ -1703,16 +1703,16 @@ DMenu MenuFixit = {
DMENU_NORMAL_TYPE,
"Please choose a fixit option",
"There are three ways of going into \"fixit\" mode:\n"
"- you can use the 2nd FreeBSD CDROM, in which case there will be\n"
"- you can use the live filesystem CDROM/DVD, in which case there will be\n"
" full access to the complete set of FreeBSD commands and utilities,\n"
"- you can use the more limited (but perhaps customized) fixit floppy,\n"
"- or you can start an Emergency Holographic Shell now, which is\n"
" limited to the subset of commands that is already available right now.",
"Press F1 for more detailed repair instructions",
"fixit",
{ { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ "2 CDROM", "Use the 2nd \"live\" CDROM from the distribution", NULL, installFixitCDROM },
{ "3 Floppy", "Use a floppy generated from the fixit image", NULL, installFixitFloppy },
{ "4 Shell", "Start an Emergency Holographic Shell", NULL, installFixitHoloShell },
{ { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ "2 CDROM/DVD", "Use the \"live\" filesystem CDROM/DVD", NULL, installFixitCDROM },
{ "3 Floppy", "Use a floppy generated from the fixit image", NULL, installFixitFloppy },
{ "4 Shell", "Start an Emergency Holographic Shell", NULL, installFixitHoloShell },
{ NULL } },
};