From bde3bdd5867fb946e64950e1e78ee86a76909805 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sat, 15 Feb 2014 19:45:43 +0000 Subject: [PATCH] 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. --- distrib/utils/sysinst/arch/alpha/md.c | 4 ++-- distrib/utils/sysinst/arch/landisk/md.c | 4 ++-- distrib/utils/sysinst/arch/macppc/md.c | 4 ++-- distrib/utils/sysinst/arch/mipsco/md.c | 4 ++-- distrib/utils/sysinst/arch/news68k/md.c | 4 ++-- distrib/utils/sysinst/arch/newsmips/md.c | 4 ++-- distrib/utils/sysinst/arch/pmax/md.c | 4 ++-- distrib/utils/sysinst/arch/vax/md.c | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/distrib/utils/sysinst/arch/alpha/md.c b/distrib/utils/sysinst/arch/alpha/md.c index 1114462f18d3..077144527bc8 100644 --- a/distrib/utils/sysinst/arch/alpha/md.c +++ b/distrib/utils/sysinst/arch/alpha/md.c @@ -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. @@ -151,7 +151,7 @@ md_post_newfs(void) char *bootxx; int error; - printf(msg_string(MSG_dobootblks), diskdev); + msg_display(MSG_dobootblks, diskdev); cp_to_target("/usr/mdec/boot", "/boot"); bootxx = bootxx_name(); if (bootxx != NULL) { diff --git a/distrib/utils/sysinst/arch/landisk/md.c b/distrib/utils/sysinst/arch/landisk/md.c index da86bd260041..f93b2c6a69c7 100644 --- a/distrib/utils/sysinst/arch/landisk/md.c +++ b/distrib/utils/sysinst/arch/landisk/md.c @@ -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. @@ -124,7 +124,7 @@ md_post_newfs(void) char *bootxx; int error; - printf (msg_string(MSG_dobootblks), diskdev); + msg_display(MSG_dobootblks, diskdev); cp_to_target("/usr/mdec/boot", "/boot"); bootxx = bootxx_name(); if (bootxx != NULL) { diff --git a/distrib/utils/sysinst/arch/macppc/md.c b/distrib/utils/sysinst/arch/macppc/md.c index 2b9d90cba4ef..9013df0beb60 100644 --- a/distrib/utils/sysinst/arch/macppc/md.c +++ b/distrib/utils/sysinst/arch/macppc/md.c @@ -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. @@ -175,7 +175,7 @@ md_post_newfs(void) if (bsdlabel[PART_A].pi_offset != 0) return 0; - printf (msg_string(MSG_dobootblks), diskdev); + msg_display(MSG_dobootblks, diskdev); cp_to_target("/usr/mdec/ofwboot", bootfile); sync(); run_program(RUN_DISPLAY, "/usr/sbin/installboot /dev/r%sa %s %s", diff --git a/distrib/utils/sysinst/arch/mipsco/md.c b/distrib/utils/sysinst/arch/mipsco/md.c index 1a035d593def..6df9b55886e2 100644 --- a/distrib/utils/sysinst/arch/mipsco/md.c +++ b/distrib/utils/sysinst/arch/mipsco/md.c @@ -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. @@ -160,7 +160,7 @@ md_post_newfs(void) return 0; } - printf(msg_string(MSG_dobootblks), diskdev); + msg_display(MSG_dobootblks, diskdev); cp_to_target("/usr/mdec/boot", "/boot"); if (run_program(RUN_DISPLAY | RUN_NO_CLEAR, "/usr/mdec/installboot /dev/r%sc /usr/mdec/bootxx_ffs", diskdev)) diff --git a/distrib/utils/sysinst/arch/news68k/md.c b/distrib/utils/sysinst/arch/news68k/md.c index 021c24d3897d..ceafb3cd1db1 100644 --- a/distrib/utils/sysinst/arch/news68k/md.c +++ b/distrib/utils/sysinst/arch/news68k/md.c @@ -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. @@ -155,7 +155,7 @@ md_post_newfs(void) { const char *bootfile = "/boot"; - printf(msg_string(MSG_dobootblks), diskdev); + msg_display(MSG_dobootblks, diskdev); cp_to_target("/usr/mdec/boot", bootfile); sync(); run_program(RUN_DISPLAY, "/usr/sbin/installboot /dev/r%sc %s %s", diff --git a/distrib/utils/sysinst/arch/newsmips/md.c b/distrib/utils/sysinst/arch/newsmips/md.c index 11e4163ccc15..41a91239882d 100644 --- a/distrib/utils/sysinst/arch/newsmips/md.c +++ b/distrib/utils/sysinst/arch/newsmips/md.c @@ -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. @@ -150,7 +150,7 @@ md_post_newfs() { const char *bootfile = "/boot"; - printf (msg_string(MSG_dobootblks), diskdev); + msg_display(MSG_dobootblks, diskdev); cp_to_target("/usr/mdec/boot", bootfile); sync(); run_program(RUN_DISPLAY, "/usr/sbin/installboot /dev/r%sc %s %s", diff --git a/distrib/utils/sysinst/arch/pmax/md.c b/distrib/utils/sysinst/arch/pmax/md.c index e8bd354a15cd..d97b5de30426 100644 --- a/distrib/utils/sysinst/arch/pmax/md.c +++ b/distrib/utils/sysinst/arch/pmax/md.c @@ -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. @@ -161,7 +161,7 @@ md_post_newfs(void) return 0; } - printf(msg_string(MSG_dobootblks), diskdev); + msg_display(MSG_dobootblks, diskdev); cp_to_target("/usr/mdec/boot.pmax", "/boot.pmax"); bootxx = bootxx_name(); if (bootxx != NULL) { diff --git a/distrib/utils/sysinst/arch/vax/md.c b/distrib/utils/sysinst/arch/vax/md.c index cb71b8310458..e097cfeaaa2e 100644 --- a/distrib/utils/sysinst/arch/vax/md.c +++ b/distrib/utils/sysinst/arch/vax/md.c @@ -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. @@ -156,7 +156,7 @@ md_post_disklabel(void) int 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", diskdev, 'a' + getrawpartition(), diskdev); return 0;