CVS commit: src/distrib/utils/sysinst/arch/landisk
Module Name:src Committed By: tsutsui Date: Tue May 14 13:41:48 UTC 2013 Modified Files: src/distrib/utils/sysinst/arch/landisk: md.h Log Message: Add SET_X11_NOSERVERS for default installation sets. Althrough landisk doesn't have any screen console (except possible udl(4) and ukbd(4)), it's a good environment to build packages binaries for sh3el, including dreamcast. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/landisk/md.h 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.h diff -u src/distrib/utils/sysinst/arch/landisk/md.h:1.5 src/distrib/utils/sysinst/arch/landisk/md.h:1.6 --- src/distrib/utils/sysinst/arch/landisk/md.h:1.5 Mon Apr 4 08:30:33 2011 +++ src/distrib/utils/sysinst/arch/landisk/md.h Tue May 14 13:41:48 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.5 2011/04/04 08:30:33 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.6 2013/05/14 13:41:48 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -57,7 +57,7 @@ */ #define SET_KERNEL_1_NAME kern-GENERIC -#define MD_SETS_SELECTED SET_KERNEL_1, SET_SYSTEM +#define MD_SETS_SELECTED SET_KERNEL_1, SET_SYSTEM, SET_X11_NOSERVERS /* * Machine-specific command to write a new label to a disk.
CVS commit: src/distrib/utils/sysinst/arch/landisk
Module Name:src Committed By: tsutsui Date: Sat May 1 11:13:01 UTC 2010 Modified Files: src/distrib/utils/sysinst/arch/landisk: md.h Log Message: Fix pasto in comment. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/landisk/md.h 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.h diff -u src/distrib/utils/sysinst/arch/landisk/md.h:1.3 src/distrib/utils/sysinst/arch/landisk/md.h:1.4 --- src/distrib/utils/sysinst/arch/landisk/md.h:1.3 Tue Dec 22 11:14:33 2009 +++ src/distrib/utils/sysinst/arch/landisk/md.h Sat May 1 11:13:01 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2009/12/22 11:14:33 nonaka Exp $ */ +/* $NetBSD: md.h,v 1.4 2010/05/01 11:13:01 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -38,7 +38,7 @@ /* md.h -- Machine specific definitions for the landisk */ -/* evbmips uses the mbr code. */ +/* landisk uses the mbr code. */ #include mbr.h /* constants and defines */
CVS commit: src/distrib/utils/sysinst/arch/landisk
Module Name:src Committed By: tsutsui Date: Wed Apr 22 16:51:02 UTC 2009 Modified Files: src/distrib/utils/sysinst/arch/landisk: md.c Log Message: Remove a bogus (debug?) message. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 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.2 src/distrib/utils/sysinst/arch/landisk/md.c:1.3 --- src/distrib/utils/sysinst/arch/landisk/md.c:1.2 Tue Oct 7 09:58:15 2008 +++ src/distrib/utils/sysinst/arch/landisk/md.c Wed Apr 22 16:51:02 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.2 2008/10/07 09:58:15 abs Exp $ */ +/* $NetBSD: md.c,v 1.3 2009/04/22 16:51:02 tsutsui Exp $ */ /* * Copyright 1997,2002 Piermont Information Systems Inc. @@ -113,9 +113,6 @@ process_menu(MENU_ok, deconst(Warning: disk is probably not bootable)); - process_menu(MENU_ok, - deconst(blah)); - return 0; }
CVS commit: src/distrib/utils/sysinst/arch/landisk
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;
}
CVS commit: src/distrib/utils/sysinst/arch/landisk
Module Name:src
Committed By: tsutsui
Date: Wed Apr 22 17:21:48 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/landisk: md.c md.h
Log Message:
Add UFS2 root and boot support.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/landisk/md.c
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/landisk/md.h
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.4 src/distrib/utils/sysinst/arch/landisk/md.c:1.5
--- src/distrib/utils/sysinst/arch/landisk/md.c:1.4 Wed Apr 22 16:53:15 2009
+++ src/distrib/utils/sysinst/arch/landisk/md.c Wed Apr 22 17:21:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2009/04/22 16:53:15 tsutsui Exp $ */
+/* $NetBSD: md.c,v 1.5 2009/04/22 17:21:47 tsutsui Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -104,14 +104,22 @@
int
md_post_newfs(void)
{
+ char *bootxx;
+ int error;
printf (msg_string(MSG_dobootblks), diskdev);
cp_to_target(/usr/mdec/boot, /boot);
- if (run_program(RUN_DISPLAY | RUN_NO_CLEAR,
- /usr/sbin/installboot -v -m landisk /dev/r%sa /usr/mdec/bootxx_ffsv1,
- diskdev))
+ bootxx = bootxx_name();
+ if (bootxx != NULL) {
+ error = run_program(RUN_DISPLAY | RUN_NO_CLEAR,
+ /usr/sbin/installboot -v /dev/r%sa %s, diskdev, bootxx);
+ free(bootxx);
+ } else
+ error = -1;
+
+ if (error != 0)
process_menu(MENU_ok,
- deconst(Warning: disk is probably not bootable));
+ deconst(Warning: disk is probably not bootable));
return 0;
}
Index: src/distrib/utils/sysinst/arch/landisk/md.h
diff -u src/distrib/utils/sysinst/arch/landisk/md.h:1.1 src/distrib/utils/sysinst/arch/landisk/md.h:1.2
--- src/distrib/utils/sysinst/arch/landisk/md.h:1.1 Mon Apr 14 17:24:56 2008
+++ src/distrib/utils/sysinst/arch/landisk/md.h Wed Apr 22 17:21:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.1 2008/04/14 17:24:56 skrll Exp $ */
+/* $NetBSD: md.h,v 1.2 2009/04/22 17:21:47 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -46,6 +46,15 @@
/* Megs required for a full X installation. */
#define XNEEDMB 340
+/* have support for booting from UFS2 */
+#define HAVE_UFS2_BOOT
+
+/* have file system specific primary boot loader */
+#define HAVE_BOOTXX_xFS
+#define BOOTXXDIR /usr/mdec
+#define BOOTXX_FFSV1 bootxx_ffsv1
+#define BOOTXX_FFSV2 bootxx_ffsv2
+
/*
* Default filesets to fetch and install during installation or upgrade.
* The standard sets are: base etc comp games man misc text
