Module Name: src
Committed By: martin
Date: Sun Dec 15 13:39:25 UTC 2019
Modified Files:
src/usr.sbin/sysinst/arch/alpha: md.c
src/usr.sbin/sysinst/arch/emips: md.c
src/usr.sbin/sysinst/arch/hp300: md.c
src/usr.sbin/sysinst/arch/mipsco: md.c
src/usr.sbin/sysinst/arch/mvme68k: md.c
src/usr.sbin/sysinst/arch/pmax: md.c
src/usr.sbin/sysinst/arch/x68k: md.c
Log Message:
After installing boot blocks with RUN_NO_CLEAR (and handling the
potential errors) make sure to clear the stdscreen.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/alpha/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/emips/md.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/hp300/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/mipsco/md.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/mvme68k/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/pmax/md.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/x68k/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/usr.sbin/sysinst/arch/alpha/md.c
diff -u src/usr.sbin/sysinst/arch/alpha/md.c:1.6 src/usr.sbin/sysinst/arch/alpha/md.c:1.7
--- src/usr.sbin/sysinst/arch/alpha/md.c:1.6 Sat Jul 13 17:13:36 2019
+++ src/usr.sbin/sysinst/arch/alpha/md.c Sun Dec 15 13:39:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2019/07/13 17:13:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.7 2019/12/15 13:39:24 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -166,6 +166,11 @@ md_post_newfs(struct install_partition_d
process_menu(MENU_ok,
__UNCONST("Warning: disk is probably not bootable"));
+ wclear(stdscr);
+ touchwin(stdscr);
+ clearok(stdscr, 1);
+ refresh();
+
return 0;
}
Index: src/usr.sbin/sysinst/arch/emips/md.c
diff -u src/usr.sbin/sysinst/arch/emips/md.c:1.7 src/usr.sbin/sysinst/arch/emips/md.c:1.8
--- src/usr.sbin/sysinst/arch/emips/md.c:1.7 Sat Jul 13 17:13:37 2019
+++ src/usr.sbin/sysinst/arch/emips/md.c Sun Dec 15 13:39:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2019/07/13 17:13:37 martin Exp $ */
+/* $NetBSD: md.c,v 1.8 2019/12/15 13:39:24 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -175,6 +175,11 @@ md_post_extract(struct install_partition
"/bin/dd if=%s of=/dev/reflash0c bs=512", ldr_path))
process_menu(MENU_ok, __UNCONST("Warning: the system "
"is probably not bootable"));
+
+ wclear(stdscr);
+ touchwin(stdscr);
+ clearok(stdscr, 1);
+ refresh();
}
return 0;
Index: src/usr.sbin/sysinst/arch/hp300/md.c
diff -u src/usr.sbin/sysinst/arch/hp300/md.c:1.8 src/usr.sbin/sysinst/arch/hp300/md.c:1.9
--- src/usr.sbin/sysinst/arch/hp300/md.c:1.8 Sat Jul 13 17:13:37 2019
+++ src/usr.sbin/sysinst/arch/hp300/md.c Sun Dec 15 13:39:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 2019/07/13 17:13:37 martin Exp $ */
+/* $NetBSD: md.c,v 1.9 2019/12/15 13:39:24 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -187,6 +187,12 @@ md_post_newfs(struct install_partition_d
"/usr/sbin/installboot /dev/r%sc /usr/mdec/uboot.lif", pm->diskdev))
process_menu(MENU_ok,
__UNCONST("Warning: disk is probably not bootable"));
+
+ wclear(stdscr);
+ touchwin(stdscr);
+ clearok(stdscr, 1);
+ refresh();
+
return 0;
}
Index: src/usr.sbin/sysinst/arch/mipsco/md.c
diff -u src/usr.sbin/sysinst/arch/mipsco/md.c:1.6 src/usr.sbin/sysinst/arch/mipsco/md.c:1.7
--- src/usr.sbin/sysinst/arch/mipsco/md.c:1.6 Sat Jul 13 17:13:39 2019
+++ src/usr.sbin/sysinst/arch/mipsco/md.c Sun Dec 15 13:39:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2019/07/13 17:13:39 martin Exp $ */
+/* $NetBSD: md.c,v 1.7 2019/12/15 13:39:24 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -168,6 +168,12 @@ md_post_newfs(struct install_partition_d
"/usr/mdec/installboot /dev/r%sc /usr/mdec/bootxx_ffs", pm->diskdev))
process_menu(MENU_ok,
__UNCONST("Warning: disk is probably not bootable"));
+
+ wclear(stdscr);
+ touchwin(stdscr);
+ clearok(stdscr, 1);
+ refresh();
+
return 0;
}
Index: src/usr.sbin/sysinst/arch/mvme68k/md.c
diff -u src/usr.sbin/sysinst/arch/mvme68k/md.c:1.8 src/usr.sbin/sysinst/arch/mvme68k/md.c:1.9
--- src/usr.sbin/sysinst/arch/mvme68k/md.c:1.8 Sat Jul 13 17:13:39 2019
+++ src/usr.sbin/sysinst/arch/mvme68k/md.c Sun Dec 15 13:39:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 2019/07/13 17:13:39 martin Exp $ */
+/* $NetBSD: md.c,v 1.9 2019/12/15 13:39:24 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -190,6 +190,12 @@ md_post_newfs(struct install_partition_d
target_expand("/.bootsd"), pm->diskdev))
process_menu(MENU_ok,
__UNCONST("Warning: disk is probably not bootable"));
+
+ wclear(stdscr);
+ touchwin(stdscr);
+ clearok(stdscr, 1);
+ refresh();
+
return 0;
}
Index: src/usr.sbin/sysinst/arch/pmax/md.c
diff -u src/usr.sbin/sysinst/arch/pmax/md.c:1.6 src/usr.sbin/sysinst/arch/pmax/md.c:1.7
--- src/usr.sbin/sysinst/arch/pmax/md.c:1.6 Sat Jul 13 17:13:39 2019
+++ src/usr.sbin/sysinst/arch/pmax/md.c Sun Dec 15 13:39:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2019/07/13 17:13:39 martin Exp $ */
+/* $NetBSD: md.c,v 1.7 2019/12/15 13:39:24 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -177,6 +177,11 @@ md_post_newfs(struct install_partition_d
process_menu(MENU_ok,
__UNCONST("Warning: disk is probably not bootable"));
+ wclear(stdscr);
+ touchwin(stdscr);
+ clearok(stdscr, 1);
+ refresh();
+
return 0;
}
Index: src/usr.sbin/sysinst/arch/x68k/md.c
diff -u src/usr.sbin/sysinst/arch/x68k/md.c:1.8 src/usr.sbin/sysinst/arch/x68k/md.c:1.9
--- src/usr.sbin/sysinst/arch/x68k/md.c:1.8 Sat Jul 13 17:13:40 2019
+++ src/usr.sbin/sysinst/arch/x68k/md.c Sun Dec 15 13:39:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 2019/07/13 17:13:40 martin Exp $ */
+/* $NetBSD: md.c,v 1.9 2019/12/15 13:39:24 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -276,6 +276,12 @@ md_post_newfs(struct install_partition_d
pm->diskdev))
process_menu(MENU_ok,
__UNCONST("Warning: disk is probably not bootable"));
+
+ wclear(stdscr);
+ touchwin(stdscr);
+ clearok(stdscr, 1);
+ refresh();
+
return 0;
}
