Use msg_display(3) rather than printf(3) to print dobootblk messages.

The latter won't show any characters on the sysinst screen
and other ports have used the former.
This commit is contained in:
tsutsui 2014-02-15 19:45:43 +00:00
parent dcc9e2357f
commit bde3bdd586
8 changed files with 16 additions and 16 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.51 2011/11/04 11:27:01 martin Exp $ */ /* $NetBSD: md.c,v 1.52 2014/02/15 19:45:43 tsutsui Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -151,7 +151,7 @@ md_post_newfs(void)
char *bootxx; char *bootxx;
int error; int error;
printf(msg_string(MSG_dobootblks), diskdev); msg_display(MSG_dobootblks, diskdev);
cp_to_target("/usr/mdec/boot", "/boot"); cp_to_target("/usr/mdec/boot", "/boot");
bootxx = bootxx_name(); bootxx = bootxx_name();
if (bootxx != NULL) { if (bootxx != NULL) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.10 2011/11/04 11:27:03 martin Exp $ */ /* $NetBSD: md.c,v 1.11 2014/02/15 19:45:43 tsutsui Exp $ */
/* /*
* Copyright 1997,2002 Piermont Information Systems Inc. * Copyright 1997,2002 Piermont Information Systems Inc.
@ -124,7 +124,7 @@ md_post_newfs(void)
char *bootxx; char *bootxx;
int error; int error;
printf (msg_string(MSG_dobootblks), diskdev); msg_display(MSG_dobootblks, diskdev);
cp_to_target("/usr/mdec/boot", "/boot"); cp_to_target("/usr/mdec/boot", "/boot");
bootxx = bootxx_name(); bootxx = bootxx_name();
if (bootxx != NULL) { if (bootxx != NULL) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.45 2011/11/04 11:27:03 martin Exp $ */ /* $NetBSD: md.c,v 1.46 2014/02/15 19:45:43 tsutsui Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -175,7 +175,7 @@ md_post_newfs(void)
if (bsdlabel[PART_A].pi_offset != 0) if (bsdlabel[PART_A].pi_offset != 0)
return 0; return 0;
printf (msg_string(MSG_dobootblks), diskdev); msg_display(MSG_dobootblks, diskdev);
cp_to_target("/usr/mdec/ofwboot", bootfile); cp_to_target("/usr/mdec/ofwboot", bootfile);
sync(); sync();
run_program(RUN_DISPLAY, "/usr/sbin/installboot /dev/r%sa %s %s", run_program(RUN_DISPLAY, "/usr/sbin/installboot /dev/r%sa %s %s",

View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.20 2012/01/05 21:32:36 christos Exp $ */ /* $NetBSD: md.c,v 1.21 2014/02/15 19:45:43 tsutsui Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -160,7 +160,7 @@ md_post_newfs(void)
return 0; return 0;
} }
printf(msg_string(MSG_dobootblks), diskdev); msg_display(MSG_dobootblks, diskdev);
cp_to_target("/usr/mdec/boot", "/boot"); cp_to_target("/usr/mdec/boot", "/boot");
if (run_program(RUN_DISPLAY | RUN_NO_CLEAR, if (run_program(RUN_DISPLAY | RUN_NO_CLEAR,
"/usr/mdec/installboot /dev/r%sc /usr/mdec/bootxx_ffs", diskdev)) "/usr/mdec/installboot /dev/r%sc /usr/mdec/bootxx_ffs", diskdev))

View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.34 2011/11/04 11:27:04 martin Exp $ */ /* $NetBSD: md.c,v 1.35 2014/02/15 19:45:43 tsutsui Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -155,7 +155,7 @@ md_post_newfs(void)
{ {
const char *bootfile = "/boot"; const char *bootfile = "/boot";
printf(msg_string(MSG_dobootblks), diskdev); msg_display(MSG_dobootblks, diskdev);
cp_to_target("/usr/mdec/boot", bootfile); cp_to_target("/usr/mdec/boot", bootfile);
sync(); sync();
run_program(RUN_DISPLAY, "/usr/sbin/installboot /dev/r%sc %s %s", run_program(RUN_DISPLAY, "/usr/sbin/installboot /dev/r%sc %s %s",

View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.21 2011/11/04 11:27:04 martin Exp $ */ /* $NetBSD: md.c,v 1.22 2014/02/15 19:45:43 tsutsui Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -150,7 +150,7 @@ md_post_newfs()
{ {
const char *bootfile = "/boot"; const char *bootfile = "/boot";
printf (msg_string(MSG_dobootblks), diskdev); msg_display(MSG_dobootblks, diskdev);
cp_to_target("/usr/mdec/boot", bootfile); cp_to_target("/usr/mdec/boot", bootfile);
sync(); sync();
run_program(RUN_DISPLAY, "/usr/sbin/installboot /dev/r%sc %s %s", run_program(RUN_DISPLAY, "/usr/sbin/installboot /dev/r%sc %s %s",

View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.67 2012/01/05 21:32:36 christos Exp $ */ /* $NetBSD: md.c,v 1.68 2014/02/15 19:45:43 tsutsui Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -161,7 +161,7 @@ md_post_newfs(void)
return 0; return 0;
} }
printf(msg_string(MSG_dobootblks), diskdev); msg_display(MSG_dobootblks, diskdev);
cp_to_target("/usr/mdec/boot.pmax", "/boot.pmax"); cp_to_target("/usr/mdec/boot.pmax", "/boot.pmax");
bootxx = bootxx_name(); bootxx = bootxx_name();
if (bootxx != NULL) { if (bootxx != NULL) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.39 2012/01/05 21:32:36 christos Exp $ */ /* $NetBSD: md.c,v 1.40 2014/02/15 19:45:43 tsutsui Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -156,7 +156,7 @@ md_post_disklabel(void)
int int
md_post_newfs(void) md_post_newfs(void)
{ {
printf(msg_string(MSG_dobootblks), diskdev); msg_display(MSG_dobootblks, diskdev);
run_program(0, "/usr/sbin/installboot /dev/r%s%c /usr/mdec/%.2sboot", run_program(0, "/usr/sbin/installboot /dev/r%s%c /usr/mdec/%.2sboot",
diskdev, 'a' + getrawpartition(), diskdev); diskdev, 'a' + getrawpartition(), diskdev);
return 0; return 0;