Module Name: src
Committed By: riz
Date: Fri Jul 18 02:21:53 UTC 2014
Modified Files:
src/distrib/utils/sysinst/arch/alpha [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/landisk [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/macppc [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/mipsco [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/news68k [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/newsmips [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/pmax [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/vax [netbsd-6]: md.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1079):
distrib/utils/sysinst/arch/newsmips/md.c: revision 1.22
distrib/utils/sysinst/arch/pmax/md.c: revision 1.68
distrib/utils/sysinst/arch/vax/md.c: revision 1.40
distrib/utils/sysinst/arch/alpha/md.c: revision 1.52
distrib/utils/sysinst/arch/macppc/md.c: revision 1.46
distrib/utils/sysinst/arch/mipsco/md.c: revision 1.21
distrib/utils/sysinst/arch/landisk/md.c: revision 1.11
distrib/utils/sysinst/arch/news68k/md.c: revision 1.35
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.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.51.2.1 src/distrib/utils/sysinst/arch/alpha/md.c
cvs rdiff -u -r1.10 -r1.10.2.1 src/distrib/utils/sysinst/arch/landisk/md.c
cvs rdiff -u -r1.45 -r1.45.2.1 src/distrib/utils/sysinst/arch/macppc/md.c
cvs rdiff -u -r1.20 -r1.20.2.1 src/distrib/utils/sysinst/arch/mipsco/md.c
cvs rdiff -u -r1.34 -r1.34.2.1 src/distrib/utils/sysinst/arch/news68k/md.c
cvs rdiff -u -r1.21 -r1.21.2.1 src/distrib/utils/sysinst/arch/newsmips/md.c
cvs rdiff -u -r1.67 -r1.67.2.1 src/distrib/utils/sysinst/arch/pmax/md.c
cvs rdiff -u -r1.39 -r1.39.2.1 src/distrib/utils/sysinst/arch/vax/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/alpha/md.c
diff -u src/distrib/utils/sysinst/arch/alpha/md.c:1.51 src/distrib/utils/sysinst/arch/alpha/md.c:1.51.2.1
--- src/distrib/utils/sysinst/arch/alpha/md.c:1.51 Fri Nov 4 11:27:01 2011
+++ src/distrib/utils/sysinst/arch/alpha/md.c Fri Jul 18 02:21:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.51 2011/11/04 11:27:01 martin Exp $ */
+/* $NetBSD: md.c,v 1.51.2.1 2014/07/18 02:21:53 riz 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) {
Index: src/distrib/utils/sysinst/arch/landisk/md.c
diff -u src/distrib/utils/sysinst/arch/landisk/md.c:1.10 src/distrib/utils/sysinst/arch/landisk/md.c:1.10.2.1
--- src/distrib/utils/sysinst/arch/landisk/md.c:1.10 Fri Nov 4 11:27:03 2011
+++ src/distrib/utils/sysinst/arch/landisk/md.c Fri Jul 18 02:21:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2011/11/04 11:27:03 martin Exp $ */
+/* $NetBSD: md.c,v 1.10.2.1 2014/07/18 02:21:53 riz 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) {
Index: src/distrib/utils/sysinst/arch/macppc/md.c
diff -u src/distrib/utils/sysinst/arch/macppc/md.c:1.45 src/distrib/utils/sysinst/arch/macppc/md.c:1.45.2.1
--- src/distrib/utils/sysinst/arch/macppc/md.c:1.45 Fri Nov 4 11:27:03 2011
+++ src/distrib/utils/sysinst/arch/macppc/md.c Fri Jul 18 02:21:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.45 2011/11/04 11:27:03 martin Exp $ */
+/* $NetBSD: md.c,v 1.45.2.1 2014/07/18 02:21:53 riz 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",
Index: src/distrib/utils/sysinst/arch/mipsco/md.c
diff -u src/distrib/utils/sysinst/arch/mipsco/md.c:1.20 src/distrib/utils/sysinst/arch/mipsco/md.c:1.20.2.1
--- src/distrib/utils/sysinst/arch/mipsco/md.c:1.20 Thu Jan 5 21:32:36 2012
+++ src/distrib/utils/sysinst/arch/mipsco/md.c Fri Jul 18 02:21:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.20 2012/01/05 21:32:36 christos Exp $ */
+/* $NetBSD: md.c,v 1.20.2.1 2014/07/18 02:21:53 riz 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))
Index: src/distrib/utils/sysinst/arch/news68k/md.c
diff -u src/distrib/utils/sysinst/arch/news68k/md.c:1.34 src/distrib/utils/sysinst/arch/news68k/md.c:1.34.2.1
--- src/distrib/utils/sysinst/arch/news68k/md.c:1.34 Fri Nov 4 11:27:04 2011
+++ src/distrib/utils/sysinst/arch/news68k/md.c Fri Jul 18 02:21:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.34 2011/11/04 11:27:04 martin Exp $ */
+/* $NetBSD: md.c,v 1.34.2.1 2014/07/18 02:21:53 riz 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",
Index: src/distrib/utils/sysinst/arch/newsmips/md.c
diff -u src/distrib/utils/sysinst/arch/newsmips/md.c:1.21 src/distrib/utils/sysinst/arch/newsmips/md.c:1.21.2.1
--- src/distrib/utils/sysinst/arch/newsmips/md.c:1.21 Fri Nov 4 11:27:04 2011
+++ src/distrib/utils/sysinst/arch/newsmips/md.c Fri Jul 18 02:21:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.21 2011/11/04 11:27:04 martin Exp $ */
+/* $NetBSD: md.c,v 1.21.2.1 2014/07/18 02:21:52 riz 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",
Index: src/distrib/utils/sysinst/arch/pmax/md.c
diff -u src/distrib/utils/sysinst/arch/pmax/md.c:1.67 src/distrib/utils/sysinst/arch/pmax/md.c:1.67.2.1
--- src/distrib/utils/sysinst/arch/pmax/md.c:1.67 Thu Jan 5 21:32:36 2012
+++ src/distrib/utils/sysinst/arch/pmax/md.c Fri Jul 18 02:21:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.67 2012/01/05 21:32:36 christos Exp $ */
+/* $NetBSD: md.c,v 1.67.2.1 2014/07/18 02:21:52 riz 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) {
Index: src/distrib/utils/sysinst/arch/vax/md.c
diff -u src/distrib/utils/sysinst/arch/vax/md.c:1.39 src/distrib/utils/sysinst/arch/vax/md.c:1.39.2.1
--- src/distrib/utils/sysinst/arch/vax/md.c:1.39 Thu Jan 5 21:32:36 2012
+++ src/distrib/utils/sysinst/arch/vax/md.c Fri Jul 18 02:21:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.39 2012/01/05 21:32:36 christos Exp $ */
+/* $NetBSD: md.c,v 1.39.2.1 2014/07/18 02:21:52 riz 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;
