From 8f4d94ed22e2d152d49022d4bf371d7da5f79421 Mon Sep 17 00:00:00 2001 From: thorpej Date: Wed, 15 Jan 2003 00:09:30 +0000 Subject: [PATCH] Allow the user to select the console speed of the boot blocks. --- distrib/utils/sysinst/arch/i386/md.c | 10 +++++----- distrib/utils/sysinst/arch/i386/menus.md.en | 14 +++++++++++--- distrib/utils/sysinst/arch/i386/menus.md.fr | 14 +++++++++++--- distrib/utils/sysinst/arch/i386/menus.md.pl | 14 +++++++++++--- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/distrib/utils/sysinst/arch/i386/md.c b/distrib/utils/sysinst/arch/i386/md.c index 984eeb74d49d..d595d3f713bf 100644 --- a/distrib/utils/sysinst/arch/i386/md.c +++ b/distrib/utils/sysinst/arch/i386/md.c @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.69 2003/01/12 21:49:51 christos Exp $ */ +/* $NetBSD: md.c,v 1.70 2003/01/15 00:09:30 thorpej Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -211,16 +211,16 @@ md_post_newfs(void) int ret; /* boot blocks ... */ - ret = stat("/usr/mdec/biosboot_com0.sym", &sb); + ret = stat("/usr/mdec/biosboot_com0_9600.sym", &sb); if ((ret != -1) && (sb.st_mode & S_IFREG)) { msg_display(MSG_getboottype); process_menu(MENU_getboottype); } msg_display(MSG_dobootblks, diskdev); - if (!strcmp(boottype, "serial")) + if (!strncmp(boottype, "serial", 6)) return run_prog(RUN_DISPLAY, NULL, - "/usr/mdec/installboot -v /usr/mdec/biosboot_com0.sym /dev/r%sa", - diskdev); + "/usr/mdec/installboot -v /usr/mdec/biosboot_com0_%s.sym /dev/r%sa", + boottype + 6, diskdev); else return run_prog(RUN_DISPLAY, NULL, "/usr/mdec/installboot -v /usr/mdec/biosboot.sym /dev/r%sa", diff --git a/distrib/utils/sysinst/arch/i386/menus.md.en b/distrib/utils/sysinst/arch/i386/menus.md.en index 5fd61ebfaa83..de9d0095730f 100644 --- a/distrib/utils/sysinst/arch/i386/menus.md.en +++ b/distrib/utils/sysinst/arch/i386/menus.md.en @@ -1,4 +1,4 @@ -/* $NetBSD: menus.md.en,v 1.39 2003/01/10 20:00:30 christos Exp $ */ +/* $NetBSD: menus.md.en,v 1.40 2003/01/15 00:09:31 thorpej Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -39,8 +39,16 @@ /* Menu definitions for sysinst. i386 version, machine dependent. */ menu getboottype, title "Bootblocks selection"; - option "Use normal bootblocks", exit, action {boottype = "normal";}; - option "Use serial bootblocks", exit, action {boottype = "serial";}; + option "Use normal bootblocks", exit, action + {boottype = "normal";}; + option "Use serial (9600) bootblocks", exit, action + {boottype = "serial9600";}; + option "Use serial (38400) bootblocks", exit, action + {boottype = "serial38400";}; + option "Use serial (57600) bootblocks", exit, action + {boottype = "serial57600";}; + option "Use serial (115200) bootblocks", exit, action + {boottype = "serial115200";}; menu fullpart, title "Select your choice"; option "Use only part of the disk", exit, action {usefull = 0;}; diff --git a/distrib/utils/sysinst/arch/i386/menus.md.fr b/distrib/utils/sysinst/arch/i386/menus.md.fr index c9c9b29eb7f2..5c113e840cc7 100644 --- a/distrib/utils/sysinst/arch/i386/menus.md.fr +++ b/distrib/utils/sysinst/arch/i386/menus.md.fr @@ -1,4 +1,4 @@ -/* $NetBSD: menus.md.fr,v 1.33 2003/01/10 20:00:30 christos Exp $ */ +/* $NetBSD: menus.md.fr,v 1.34 2003/01/15 00:09:31 thorpej Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -39,8 +39,16 @@ /* Menu definitions for sysinst. i386 version, machine dependent. */ menu getboottype, title "Sélection de Bootblocks"; - option "Utilisez normal le bootblocks", exit, action {boottype = "normal";}; - option "Utilisez serial le bootblocks", exit, action {boottype = "serial";}; + option "Utilisez normal le bootblocks", exit, action + {boottype = "normal";}; + option "Utilisez serial (9600) le bootblocks", exit, action + {boottype = "serial9600";}; + option "Utilisez serial (38400) le bootblocks", exit, action + {boottype = "serial38400";}; + option "Utilisez serial (57600) le bootblocks", exit, action + {boottype = "serial57600";}; + option "Utilisez serial (115200) le bootblocks", exit, action + {boottype = "serial115200";}; menu fullpart, y=15, title "Faite votre choix"; option "Utilisation d'une partie du disque", exit, action {usefull = 0;}; diff --git a/distrib/utils/sysinst/arch/i386/menus.md.pl b/distrib/utils/sysinst/arch/i386/menus.md.pl index b39e924014c5..0b616062134d 100644 --- a/distrib/utils/sysinst/arch/i386/menus.md.pl +++ b/distrib/utils/sysinst/arch/i386/menus.md.pl @@ -1,4 +1,4 @@ -/* $NetBSD: menus.md.pl,v 1.4 2003/01/10 20:00:30 christos Exp $ */ +/* $NetBSD: menus.md.pl,v 1.5 2003/01/15 00:09:31 thorpej Exp $ */ /* Based on english version: */ /* NetBSD: menus.md.en,v 1.36 2001/11/29 23:20:58 thorpej Exp */ @@ -41,8 +41,16 @@ /* Menu definitions for sysinst. i386 version, machine dependent. */ menu getboottype, title "Wybor bootblokow"; - option "Uzyj normalnych bootblokow", exit, action {boottype = "normal";}; - option "Uzyj bootblokow na zewn. konsole", exit, action {boottype = "serial";}; + option "Uzyj normalnych bootblokow", exit, action + {boottype = "normal";}; + option "Uzyj bootblokow na zewn. konsole (9600)", exit, action + {boottype = "serial9600";}; + option "Uzyj bootblokow na zewn. konsole (38400)", exit, action + {boottype = "serial38400";}; + option "Uzyj bootblokow na zewn. konsole (57600)", exit, action + {boottype = "serial57600";}; + option "Uzyj bootblokow na zewn. konsole (115200)", exit, action + {boottype = "serial115200";}; menu fullpart, title "Wybierz"; option "Uzyj tylko czesci dysku", exit, action {usefull = 0;};