Module Name: src
Committed By: tsutsui
Date: Wed Apr 22 16:53:15 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/landisk: md.c
Log Message:
Install MBR bootcode (/usr/mdec/mbr) after write_mbr().
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/landisk/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/landisk/md.c
diff -u src/distrib/utils/sysinst/arch/landisk/md.c:1.3 src/distrib/utils/sysinst/arch/landisk/md.c:1.4
--- src/distrib/utils/sysinst/arch/landisk/md.c:1.3 Wed Apr 22 16:51:02 2009
+++ src/distrib/utils/sysinst/arch/landisk/md.c Wed Apr 22 16:53:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.3 2009/04/22 16:51:02 tsutsui Exp $ */
+/* $NetBSD: md.c,v 1.4 2009/04/22 16:53:15 tsutsui Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -119,17 +119,21 @@
int
md_pre_disklabel(void)
{
+
if (no_mbr)
return 0;
msg_display(MSG_dofdisk);
/* write edited MBR onto disk. */
- if (write_mbr(diskdev, &mbr, 1) != 0) {
+ if (write_mbr(diskdev, &mbr, 1) != 0 ||
+ run_program(RUN_SILENT | RUN_ERROR_OK,
+ "/sbin/fdisk -f -i -c /usr/mdec/mbr %s", diskdev)) {
msg_display(MSG_wmbrfail);
process_menu(MENU_ok, NULL);
return 1;
}
+
return 0;
}