CVS commit: src/distrib/utils/sysinst/arch/alpha
Module Name:src Committed By: tsutsui Date: Mon Jun 2 15:03:47 UTC 2014 Modified Files: src/distrib/utils/sysinst/arch/alpha: md.c Log Message: Apply patch in PR port-alpha/48697 (with some tweaks). Tru64 UNIX's disklabel is the same format as BSD disklabel, and it seems Tru64 stores incorrect geometry values in d_nsectors (sectors/track) and d_secpercyl (sectors/cylinder). d_secperunit seems always reliable so use it to get dlsec (sectors/track) and dlcylsize (sectors/cylinder) values. Should be pulled up to netbsd-6 branches. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/distrib/utils/sysinst/arch/alpha/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.52 src/distrib/utils/sysinst/arch/alpha/md.c:1.53 --- src/distrib/utils/sysinst/arch/alpha/md.c:1.52 Sat Feb 15 19:45:43 2014 +++ src/distrib/utils/sysinst/arch/alpha/md.c Mon Jun 2 15:03:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.52 2014/02/15 19:45:43 tsutsui Exp $ */ +/* $NetBSD: md.c,v 1.53 2014/06/02 15:03:47 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -85,19 +85,19 @@ md_get_info(void) dlcyl = disklabel.d_ncylinders; dlhead = disklabel.d_ntracks; - dlsec = disklabel.d_nsectors; sectorsize = disklabel.d_secsize; - dlcylsize = disklabel.d_secpercyl; + dlsize = disklabel.d_secperunit; /* - * Compute whole disk size. Take max of (dlcyl*dlhead*dlsec) - * and secperunit, just in case the disk is already labelled. - * (If our new label's RAW_PART size ends up smaller than the - * in-core RAW_PART size value, updating the label will fail.) + * Tru64 UNIX's disklabel is the same format as BSD disklabel, + * and it seems Tru64 stores incorrect geometry values in + * d_nsectors (sectors/track) and d_secpercyl (sectors/cylinder). + * d_secperunit seems always reliable so use it to get + * dlsec (sectors/track) and dlcylsize (sectors/cylinder) values. + * See PR/48697 for details. */ - dlsize = dlcyl*dlhead*dlsec; - if (disklabel.d_secperunit dlsize) - dlsize = disklabel.d_secperunit; + dlsec = dlsize / (dlhead * dlcyl); + dlcylsize = dlsec * dlhead; return 1; }
CVS commit: src/distrib/utils/sysinst/arch/vax
Module Name:src
Committed By: martin
Date: Wed May 28 11:16:03 UTC 2014
Modified Files:
src/distrib/utils/sysinst/arch/vax: md.c
Log Message:
Enable swap during sysinst as early as possible
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 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/vax/md.c
diff -u src/distrib/utils/sysinst/arch/vax/md.c:1.40 src/distrib/utils/sysinst/arch/vax/md.c:1.41
--- src/distrib/utils/sysinst/arch/vax/md.c:1.40 Sat Feb 15 19:45:43 2014
+++ src/distrib/utils/sysinst/arch/vax/md.c Wed May 28 11:16:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.40 2014/02/15 19:45:43 tsutsui Exp $ */
+/* $NetBSD: md.c,v 1.41 2014/05/28 11:16:03 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -143,6 +143,9 @@ md_pre_disklabel(void)
int
md_post_disklabel(void)
{
+ if (get_ramsize() = 32)
+ set_swap(diskdev, bsdlabel);
+
return 0;
}
@@ -179,6 +182,9 @@ md_cleanup_install(void)
int
md_pre_update(void)
{
+ if (get_ramsize() = 32)
+ set_swap(diskdev, NULL);
+
return 1;
}
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: tsutsui
Date: Sat Feb 15 19:45:43 UTC 2014
Modified Files:
src/distrib/utils/sysinst/arch/alpha: md.c
src/distrib/utils/sysinst/arch/landisk: md.c
src/distrib/utils/sysinst/arch/macppc: md.c
src/distrib/utils/sysinst/arch/mipsco: md.c
src/distrib/utils/sysinst/arch/news68k: md.c
src/distrib/utils/sysinst/arch/newsmips: md.c
src/distrib/utils/sysinst/arch/pmax: md.c
src/distrib/utils/sysinst/arch/vax: md.c
Log Message:
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.52 src/distrib/utils/sysinst/arch/alpha/md.c
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/landisk/md.c
cvs rdiff -u -r1.45 -r1.46 src/distrib/utils/sysinst/arch/macppc/md.c
cvs rdiff -u -r1.20 -r1.21 src/distrib/utils/sysinst/arch/mipsco/md.c
cvs rdiff -u -r1.34 -r1.35 src/distrib/utils/sysinst/arch/news68k/md.c
cvs rdiff -u -r1.21 -r1.22 src/distrib/utils/sysinst/arch/newsmips/md.c
cvs rdiff -u -r1.67 -r1.68 src/distrib/utils/sysinst/arch/pmax/md.c
cvs rdiff -u -r1.39 -r1.40 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.52
--- 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 Sat Feb 15 19:45:43 2014
@@ -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) {
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.11
--- 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 Sat Feb 15 19:45:43 2014
@@ -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) {
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.46
--- 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 Sat Feb 15 19:45:43 2014
@@ -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,
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.21
--- 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 Sat Feb 15 19:45:43 2014
@@ -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))
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.35
--- 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 Sat Feb 15 19:45:43 2014
@@ -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 $ */
/*
*
CVS commit: src/distrib/utils/sysinst/arch/luna68k
Module Name:src Committed By: tsutsui Date: Tue May 14 13:08:57 UTC 2013 Modified Files: src/distrib/utils/sysinst/arch/luna68k: md.h Log Message: Use the default MD_SETS_SELECTED in util.c which includes an Xserver set. luna68k has working Xserver so no need to specify md MD_SETS_SELECTED with SET_X11_NOSERVERS. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/luna68k/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/luna68k/md.h diff -u src/distrib/utils/sysinst/arch/luna68k/md.h:1.1 src/distrib/utils/sysinst/arch/luna68k/md.h:1.2 --- src/distrib/utils/sysinst/arch/luna68k/md.h:1.1 Sat Jul 16 15:52:21 2011 +++ src/distrib/utils/sysinst/arch/luna68k/md.h Tue May 14 13:08:57 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2011/07/16 15:52:21 tsutsui Exp $ */ +/* $NetBSD: md.h,v 1.2 2013/05/14 13:08:57 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -58,8 +58,6 @@ */ #define SET_KERNEL_1_NAME kern-GENERIC -#define MD_SETS_SELECTED SET_KERNEL_1, SET_SYSTEM, SET_X11_NOSERVERS - /* * Machine-specific command to write a new label to a disk. * If not defined, we assume the port does not support disklabels and
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src Committed By: tsutsui Date: Tue May 14 13:14:28 UTC 2013 Modified Files: src/distrib/utils/sysinst/arch/hp300: md.h src/distrib/utils/sysinst/arch/newsmips: md.h src/distrib/utils/sysinst/arch/prep: md.h Log Message: Use the default MD_SETS_SELECTED for ports which have Xservers. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/sysinst/arch/hp300/md.h cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/sysinst/arch/newsmips/md.h cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/sysinst/arch/prep/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/hp300/md.h diff -u src/distrib/utils/sysinst/arch/hp300/md.h:1.17 src/distrib/utils/sysinst/arch/hp300/md.h:1.18 --- src/distrib/utils/sysinst/arch/hp300/md.h:1.17 Mon Apr 4 08:30:28 2011 +++ src/distrib/utils/sysinst/arch/hp300/md.h Tue May 14 13:14:27 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.17 2011/04/04 08:30:28 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.18 2013/05/14 13:14:27 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -69,8 +69,6 @@ */ #define SET_KERNEL_1_NAME kern-GENERIC -#define MD_SETS_VALID SET_KERNEL, SET_SYSTEM, SET_X11_NOSERVERS - /* * Disk names accepted as valid targets for a from-scratch installation. * Index: src/distrib/utils/sysinst/arch/newsmips/md.h diff -u src/distrib/utils/sysinst/arch/newsmips/md.h:1.13 src/distrib/utils/sysinst/arch/newsmips/md.h:1.14 --- src/distrib/utils/sysinst/arch/newsmips/md.h:1.13 Mon Apr 4 08:30:38 2011 +++ src/distrib/utils/sysinst/arch/newsmips/md.h Tue May 14 13:14:28 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.13 2011/04/04 08:30:38 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.14 2013/05/14 13:14:28 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -57,7 +57,6 @@ * or upgrade. */ #define SET_KERNEL_1_NAME kern-GENERIC -#define MD_SETS_SELECTED SET_KERNEL_1, SET_SYSTEM, SET_X11_NOSERVERS /* * Machine-specific command to write a new label to a disk. Index: src/distrib/utils/sysinst/arch/prep/md.h diff -u src/distrib/utils/sysinst/arch/prep/md.h:1.17 src/distrib/utils/sysinst/arch/prep/md.h:1.18 --- src/distrib/utils/sysinst/arch/prep/md.h:1.17 Mon Apr 4 08:30:40 2011 +++ src/distrib/utils/sysinst/arch/prep/md.h Tue May 14 13:14:28 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.17 2011/04/04 08:30:40 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.18 2013/05/14 13:14:28 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -74,7 +74,6 @@ * from floppy. */ #define SET_KERNEL_1_NAME kern-GENERIC -#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/prep
Module Name:src Committed By: tsutsui Date: Tue May 14 13:15:55 UTC 2013 Modified Files: src/distrib/utils/sysinst/arch/prep: md.h Log Message: Remove pasted but obsolete comments. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/sysinst/arch/prep/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/prep/md.h diff -u src/distrib/utils/sysinst/arch/prep/md.h:1.18 src/distrib/utils/sysinst/arch/prep/md.h:1.19 --- src/distrib/utils/sysinst/arch/prep/md.h:1.18 Tue May 14 13:14:28 2013 +++ src/distrib/utils/sysinst/arch/prep/md.h Tue May 14 13:15:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.18 2013/05/14 13:14:28 tsutsui Exp $ */ +/* $NetBSD: md.h,v 1.19 2013/05/14 13:15:55 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -66,12 +66,6 @@ * Default filesets to fetch and install during installation * or upgrade. The standard sets are: * base etc comp games man misc tests text xbase xcomp xetc xfont xserver - * - * i386 has the MD set kern first, because generic kernels are too - * big to fit on install floppies. i386 does not yet include the x sets. - * - * Third entry is the last extension name in the split sets for loading - * from floppy. */ #define SET_KERNEL_1_NAME kern-GENERIC
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/x68k
Module Name:src
Committed By: isaki
Date: Sun Apr 21 06:24:42 UTC 2013
Modified Files:
src/distrib/utils/sysinst/arch/x68k: md.c
Log Message:
Enable rc_configured=YES in sysinst.
The problem that sed was not contained in ramdisk was already gone.
analized by tsutsui@.
XXX Only hp300 and mvme68k seem to have the same problem.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/utils/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/distrib/utils/sysinst/arch/x68k/md.c
diff -u src/distrib/utils/sysinst/arch/x68k/md.c:1.43 src/distrib/utils/sysinst/arch/x68k/md.c:1.44
--- src/distrib/utils/sysinst/arch/x68k/md.c:1.43 Thu Jan 5 21:32:36 2012
+++ src/distrib/utils/sysinst/arch/x68k/md.c Sun Apr 21 06:24:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.43 2012/01/05 21:32:36 christos Exp $ */
+/* $NetBSD: md.c,v 1.44 2013/04/21 06:24:42 isaki Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -297,7 +297,7 @@ md_post_extract(void)
void
md_cleanup_install(void)
{
-#ifdef notyet /* sed is too large for ramdisk */
+#ifndef DEBUG
enable_rc_conf();
#endif
}
CVS commit: src/distrib/utils/sysinst/arch/x68k
Module Name:src Committed By: tsutsui Date: Sat Nov 17 19:35:55 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/x68k: md.h Log Message: Define HAVE_UFS2_BOOT to enable UFS2 root in sysinst. UFS2 support for secondary boot was added on March 2012: http://mail-index.netbsd.org/source-changes/2012/03/20/msg033042.html Note prinary boot_ufs has supported UFS2 since 2003: http://mail-index.netbsd.org/source-changes/2003/04/09/0036.html To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/distrib/utils/sysinst/arch/x68k/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/x68k/md.h diff -u src/distrib/utils/sysinst/arch/x68k/md.h:1.20 src/distrib/utils/sysinst/arch/x68k/md.h:1.21 --- src/distrib/utils/sysinst/arch/x68k/md.h:1.20 Mon Apr 4 08:30:45 2011 +++ src/distrib/utils/sysinst/arch/x68k/md.h Sat Nov 17 19:35:55 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.20 2011/04/04 08:30:45 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.21 2012/11/17 19:35:55 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -60,6 +60,9 @@ #define DEFUSRSIZE 70 /* Default /usr size, if /home */ #define XNEEDMB 35 /* Extra megs for full X installation */ +/* have support for booting from UFS2 */ +#define HAVE_UFS2_BOOT + /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are:
CVS commit: src/distrib/utils/sysinst/arch/i386
Module Name:src Committed By: christos Date: Mon Nov 5 01:25:26 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/i386: md.c Log Message: add missing include file. To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 src/distrib/utils/sysinst/arch/i386/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/i386/md.c diff -u src/distrib/utils/sysinst/arch/i386/md.c:1.129 src/distrib/utils/sysinst/arch/i386/md.c:1.130 --- src/distrib/utils/sysinst/arch/i386/md.c:1.129 Fri Nov 4 07:27:03 2011 +++ src/distrib/utils/sysinst/arch/i386/md.c Sun Nov 4 20:25:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.129 2011/11/04 11:27:03 martin Exp $ */ +/* $NetBSD: md.c,v 1.130 2012/11/05 01:25:25 christos Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -45,6 +45,7 @@ #include stddef.h #include util.h #include dirent.h +#include termios.h #include defs.h #include md.h
CVS commit: src/distrib/utils/sysinst/arch/x68k
Module Name:src Committed By: tsutsui Date: Sat Nov 3 15:40:58 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/x68k: Makefile Removed Files: src/distrib/utils/sysinst/arch/x68k: menus.md.es menus.md.pl msg.md.de msg.md.es msg.md.pl Log Message: Remove unused non-en translation messages. (src/distrib/x68k/floppies/ramdisk/Makefile specifies list.sysinst.en) To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/x68k/Makefile cvs rdiff -u -r1.2 -r0 src/distrib/utils/sysinst/arch/x68k/menus.md.es cvs rdiff -u -r1.5 -r0 src/distrib/utils/sysinst/arch/x68k/menus.md.pl \ src/distrib/utils/sysinst/arch/x68k/msg.md.de cvs rdiff -u -r1.4 -r0 src/distrib/utils/sysinst/arch/x68k/msg.md.es cvs rdiff -u -r1.9 -r0 src/distrib/utils/sysinst/arch/x68k/msg.md.pl 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/x68k/Makefile diff -u src/distrib/utils/sysinst/arch/x68k/Makefile:1.10 src/distrib/utils/sysinst/arch/x68k/Makefile:1.11 --- src/distrib/utils/sysinst/arch/x68k/Makefile:1.10 Sat Feb 19 17:00:40 2005 +++ src/distrib/utils/sysinst/arch/x68k/Makefile Sat Nov 3 15:40:58 2012 @@ -1,11 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2005/02/19 17:00:40 dsl Exp $ +# $NetBSD: Makefile,v 1.11 2012/11/03 15:40:58 tsutsui Exp $ # # Makefile for x68k # -# Note: we have no french or german messages, because x68k console does not -# support ISO-8859-1 (right half) character set. - -LANGUAGES= en pl +LANGUAGES= # no translations .include ../../Makefile.inc
CVS commit: src/distrib/utils/sysinst/arch/i386
Module Name:src
Committed By: tsutsui
Date: Wed Oct 24 11:36:02 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/i386: msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl
Log Message:
Remove useless md_may_remove_boot_medium messages. PR/47039
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/utils/sysinst/arch/i386/msg.md.de
cvs rdiff -u -r1.63 -r1.64 src/distrib/utils/sysinst/arch/i386/msg.md.en
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/sysinst/arch/i386/msg.md.es
cvs rdiff -u -r1.51 -r1.52 src/distrib/utils/sysinst/arch/i386/msg.md.fr
cvs rdiff -u -r1.36 -r1.37 src/distrib/utils/sysinst/arch/i386/msg.md.pl
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/i386/msg.md.de
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.de:1.23 src/distrib/utils/sysinst/arch/i386/msg.md.de:1.24
--- src/distrib/utils/sysinst/arch/i386/msg.md.de:1.23 Tue May 15 08:47:53 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.de Wed Oct 24 11:36:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.23 2012/05/15 08:47:53 martin Exp $ */
+/* $NetBSD: msg.md.de,v 1.24 2012/10/24 11:36:02 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -39,8 +39,7 @@ message md_hello
}
message md_may_remove_boot_medium
-{Wenn Sie von einer Diskette oder einem USB Laufwerk gebootet haben,
-können Sie diese(s) jetzt entfernen.
+{
}
message Keyboard_type {Tastaturschema}
Index: src/distrib/utils/sysinst/arch/i386/msg.md.en
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.en:1.63 src/distrib/utils/sysinst/arch/i386/msg.md.en:1.64
--- src/distrib/utils/sysinst/arch/i386/msg.md.en:1.63 Sat Mar 3 03:06:30 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.en Wed Oct 24 11:36:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.63 2012/03/03 03:06:30 tsutsui Exp $ */
+/* $NetBSD: msg.md.en,v 1.64 2012/10/24 11:36:02 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -39,8 +39,7 @@ message md_hello
}
message md_may_remove_boot_medium
-{If you booted from removable media such as a USB drive or floppy disk, you
-may now remove the device.
+{
}
message Keyboard_type {Keyboard type}
Index: src/distrib/utils/sysinst/arch/i386/msg.md.es
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.es:1.14 src/distrib/utils/sysinst/arch/i386/msg.md.es:1.15
--- src/distrib/utils/sysinst/arch/i386/msg.md.es:1.14 Thu Mar 1 16:22:15 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.es Wed Oct 24 11:36:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.14 2012/03/01 16:22:15 mbalmer Exp $ */
+/* $NetBSD: msg.md.es,v 1.15 2012/10/24 11:36:02 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -39,7 +39,7 @@ message md_hello
}
message md_may_remove_boot_medium
-{Si ha iniciado desde disquette, ahora deberia retirar el disco.
+{
}
message Keyboard_type {Tipo de teclado}
Index: src/distrib/utils/sysinst/arch/i386/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.fr:1.51 src/distrib/utils/sysinst/arch/i386/msg.md.fr:1.52
--- src/distrib/utils/sysinst/arch/i386/msg.md.fr:1.51 Mon Apr 4 08:30:32 2011
+++ src/distrib/utils/sysinst/arch/i386/msg.md.fr Wed Oct 24 11:36:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.51 2011/04/04 08:30:32 mbalmer Exp $ */
+/* $NetBSD: msg.md.fr,v 1.52 2012/10/24 11:36:02 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -39,8 +39,7 @@ message md_hello
}
message md_may_remove_boot_medium
-{Si vous avez démarré sur un média amovible (clé USB, disquette...), vous
-pouvez maintenant le retirer.
+{
}
message Keyboard_type {Type de clavier}
Index: src/distrib/utils/sysinst/arch/i386/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.36 src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.37
--- src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.36 Sat Mar 3 02:41:25 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.pl Wed Oct 24 11:36:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.36 2012/03/03 02:41:25 tsutsui Exp $ */
+/* $NetBSD: msg.md.pl,v 1.37 2012/10/24 11:36:02 tsutsui Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.24 2001/01/27 07:34:39 jmc Exp */
@@ -41,7 +41,7 @@ message md_hello
}
message md_may_remove_boot_medium
-{Jesli uruchomiles komputer z dyskietki, mozesz ja teraz wyciagnac.
+{
}
message Keyboard_type {Keyboard type}
CVS commit: src/distrib/utils/sysinst/arch/i386
Module Name:src
Committed By: martin
Date: Tue May 15 08:47:53 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/i386: msg.md.de
Log Message:
Tweak a few grammar errors
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/utils/sysinst/arch/i386/msg.md.de
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/i386/msg.md.de
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.de:1.22 src/distrib/utils/sysinst/arch/i386/msg.md.de:1.23
--- src/distrib/utils/sysinst/arch/i386/msg.md.de:1.22 Sat Mar 3 02:41:25 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.de Tue May 15 08:47:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.22 2012/03/03 02:41:25 tsutsui Exp $ */
+/* $NetBSD: msg.md.de,v 1.23 2012/05/15 08:47:53 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -55,22 +55,22 @@ message getboottype
Normale Bootblöcke benutzen die BIOS Konsolenschnittstelle als Konsole
(meistens der Monitor und die Tastatur). Serielle Bootblöcke benutzen den
-ersten seriellen Anschluss als Konsole.
+gewählten seriellen Anschluss als Konsole.
Selektierter Bootblock: }
message console_PC {BIOS Konsole}
-message console_com {Serieller Anschluss com%d mit %d baud}
+message console_com {Serielle Konsole an com%d mit %d baud}
message console_unchanged {Unverändert}
message Bootblocks_selection
{Auswahl der Bootblöcke}
-message Use_normal_bootblocks {BIOS Konsole benutzen}
-message Use_serial_com0 {Serieller Anschluss com0 benutzen}
-message Use_serial_com1 {Serieller Anschluss com1 benutzen}
-message Use_serial_com2 {Serieller Anschluss com2 benutzen}
-message Use_serial_com3 {Serieller Anschluss com3 benutzen}
-message serial_baud_rate {Serielle baud Rate}
+message Use_normal_bootblocks {BIOS Konsole}
+message Use_serial_com0 {Serielle Konsole an com0}
+message Use_serial_com1 {Serielle Konsole an com1}
+message Use_serial_com2 {Serielle Konsole an com2}
+message Use_serial_com3 {Serielle Konsole an com3}
+message serial_baud_rate {Serielle Geschwindigkeit wählen...}
message Use_existing_bootblocks {Vorhandene Bootblöcke benutzen}
message dobootblks
CVS commit: src/distrib/utils/sysinst/arch/sandpoint
Module Name:src Committed By: nisimura Date: Sat May 12 08:31:53 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/sandpoint: md.c Log Message: Add KURO-BOX/T4 support to sysinst. Tested good with the target machine. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/distrib/utils/sysinst/arch/sandpoint/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/sandpoint/md.c diff -u src/distrib/utils/sysinst/arch/sandpoint/md.c:1.39 src/distrib/utils/sysinst/arch/sandpoint/md.c:1.40 --- src/distrib/utils/sysinst/arch/sandpoint/md.c:1.39 Wed Jan 25 19:03:35 2012 +++ src/distrib/utils/sysinst/arch/sandpoint/md.c Sat May 12 08:31:52 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.39 2012/01/25 19:03:35 phx Exp $ */ +/* $NetBSD: md.c,v 1.40 2012/05/12 08:31:52 nisimura Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -77,7 +77,7 @@ md_init_set_status(int flags) prodname = malloc(len); sysctlbyname(mib_name, prodname, len, NULL, 0); - if (strcmp(prodname, kurobox) == 0) + if (strcmp(prodname, kurobox)==0 || strcmp(prodname, kurot4)==0) /* * Running on a KuroBox family product, so enable KUROBOX */ @@ -175,7 +175,7 @@ md_cleanup_install(void) * Set the console speed in /etc/ttys depending on the board. * The default speed is 115200, which is patched when needed. */ - if (strcmp(prodname, kurobox) == 0) + if (strcmp(prodname, kurobox)==0 || strcmp(prodname, kurot4)==0) new_speed = 57600; /* KuroBox */ else if (strcmp(prodname, dlink) == 0 || /* D-Link DSM-G600 */
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: tsutsui
Date: Sat Mar 3 02:41:26 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/arc: msg.md.en
src/distrib/utils/sysinst/arch/cobalt: msg.md.en
src/distrib/utils/sysinst/arch/i386: msg.md.de msg.md.pl
src/distrib/utils/sysinst/arch/mac68k: msg.md.de msg.md.pl
src/distrib/utils/sysinst/arch/ofppc: msg.md.en msg.md.es msg.md.pl
src/distrib/utils/sysinst/arch/prep: msg.md.en msg.md.es msg.md.pl
Log Message:
Remove trailing whitespaces in messages where line break is not expected.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/sysinst/arch/arc/msg.md.en
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/cobalt/msg.md.en
cvs rdiff -u -r1.21 -r1.22 src/distrib/utils/sysinst/arch/i386/msg.md.de
cvs rdiff -u -r1.35 -r1.36 src/distrib/utils/sysinst/arch/i386/msg.md.pl
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/mac68k/msg.md.de
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/sysinst/arch/mac68k/msg.md.pl
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/ofppc/msg.md.en \
src/distrib/utils/sysinst/arch/ofppc/msg.md.es \
src/distrib/utils/sysinst/arch/ofppc/msg.md.pl
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/sysinst/arch/prep/msg.md.en \
src/distrib/utils/sysinst/arch/prep/msg.md.pl
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/prep/msg.md.es
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/arc/msg.md.en
diff -u src/distrib/utils/sysinst/arch/arc/msg.md.en:1.13 src/distrib/utils/sysinst/arch/arc/msg.md.en:1.14
--- src/distrib/utils/sysinst/arch/arc/msg.md.en:1.13 Thu Mar 1 16:22:14 2012
+++ src/distrib/utils/sysinst/arch/arc/msg.md.en Sat Mar 3 02:41:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.13 2012/03/01 16:22:14 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.14 2012/03/03 02:41:25 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -70,7 +70,7 @@ It needs to be at least 1MB in size, how
recommended.}
message nobootpartdisklabel
-{There is no boot partition in the disklabel. The boot partition should
+{There is no boot partition in the disklabel. The boot partition should
match the boot partition you set up in the MBR partition table.}
message copybootloader
Index: src/distrib/utils/sysinst/arch/cobalt/msg.md.en
diff -u src/distrib/utils/sysinst/arch/cobalt/msg.md.en:1.6 src/distrib/utils/sysinst/arch/cobalt/msg.md.en:1.7
--- src/distrib/utils/sysinst/arch/cobalt/msg.md.en:1.6 Thu Mar 1 16:22:14 2012
+++ src/distrib/utils/sysinst/arch/cobalt/msg.md.en Sat Mar 3 02:41:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.6 2012/03/01 16:22:14 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.7 2012/03/03 02:41:25 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -69,7 +69,7 @@ It needs to be at least 1MB in size, how
recommended.}
message nobootpartdisklabel
-{There is no boot partition in the disklabel. The boot partition should
+{There is no boot partition in the disklabel. The boot partition should
match the boot partition you set up in the MBR partition table.}
message copybootloader
Index: src/distrib/utils/sysinst/arch/i386/msg.md.de
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.de:1.21 src/distrib/utils/sysinst/arch/i386/msg.md.de:1.22
--- src/distrib/utils/sysinst/arch/i386/msg.md.de:1.21 Thu Mar 1 16:22:15 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.de Sat Mar 3 02:41:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.21 2012/03/01 16:22:15 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.22 2012/03/03 02:41:25 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -133,7 +133,7 @@ booten. Sind Sie sicher, dass Sie fortfa
message missing_bootmenu_text
-{Sie haben mehr als ein Betriebssystem auf dieser Festplatte; allerdings ist kein
+{Sie haben mehr als ein Betriebssystem auf dieser Festplatte; allerdings ist kein
'bootmenu' (Eintrag für den NetBSD Bootloader) für die aktive Partition und/oder
der Partition vorhanden, auf die NetBSD installiert werden soll.
@@ -151,7 +151,7 @@ Sind Sie sicher, dass Sie dennoch fortfa
gelangen.)}
message installbootsel
-{Ihre Konfiguration benötigt den NetBSD Bootselect (Bootauswahl) Code, um
+{Ihre Konfiguration benötigt den NetBSD Bootselect (Bootauswahl) Code, um
das zu startende Betriebssystem beim Start des Computers zu wählen.
Dieser ist gegenwärtig noch nicht installiert; wollen Sie dies jetzt tun?}
Index: src/distrib/utils/sysinst/arch/i386/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.35 src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.36
--- src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.35 Thu Mar 1 16:22:15 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.pl Sat Mar 3 02:41:25 2012
@@ -1,4 +1,4 @@
-/*
CVS commit: src/distrib/utils/sysinst/arch/hp300
Module Name:src
Committed By: tsutsui
Date: Sat Mar 3 02:46:14 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/hp300: msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl
Log Message:
Remove unused pasto messages. No Human68k on hp300.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/hp300/msg.md.de
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/hp300/msg.md.en
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/hp300/msg.md.es
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/hp300/msg.md.fr \
src/distrib/utils/sysinst/arch/hp300/msg.md.pl
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/hp300/msg.md.de
diff -u src/distrib/utils/sysinst/arch/hp300/msg.md.de:1.6 src/distrib/utils/sysinst/arch/hp300/msg.md.de:1.7
--- src/distrib/utils/sysinst/arch/hp300/msg.md.de:1.6 Thu Mar 1 16:22:14 2012
+++ src/distrib/utils/sysinst/arch/hp300/msg.md.de Sat Mar 3 02:46:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.6 2012/03/01 16:22:14 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.7 2012/03/03 02:46:13 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -49,14 +49,6 @@ message dobootblks
{Installiere die Bootblöcke auf %s ...
}
-message newdisk
-{Ihre Festplatte, %s, scheint nicht als x68k Festplatte markiert zu sein;
-sysinst wird dies nun tun.
-Falls Sie planen eine Partition der Festplatte %s mit Human68k zu nutzen,
-sollten Sie hier unbedingt abbrechen und die Festplatte mit dem Human68k
-format.x Werkzeug formatieren.
-}
-
message ordering
{Die Anordnung der Partition %c ist falsch. Erneut editieren?}
Index: src/distrib/utils/sysinst/arch/hp300/msg.md.en
diff -u src/distrib/utils/sysinst/arch/hp300/msg.md.en:1.8 src/distrib/utils/sysinst/arch/hp300/msg.md.en:1.9
--- src/distrib/utils/sysinst/arch/hp300/msg.md.en:1.8 Mon Apr 4 08:30:28 2011
+++ src/distrib/utils/sysinst/arch/hp300/msg.md.en Sat Mar 3 02:46:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.8 2011/04/04 08:30:28 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.9 2012/03/03 02:46:13 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -48,13 +48,6 @@ message dobootblks
{Installing boot blocks on %s
}
-message newdisk
-{It appears that your disk, %s, has no X68K disk mark. sysinst is
-writing a disk mark.
-Note that if you plan to use a part of %s from Human68k, you should abort
-here and format the disk with Human68k format.x utility.
-}
-
message ordering
{The order of partition %c is wrong. Edit again?}
Index: src/distrib/utils/sysinst/arch/hp300/msg.md.es
diff -u src/distrib/utils/sysinst/arch/hp300/msg.md.es:1.4 src/distrib/utils/sysinst/arch/hp300/msg.md.es:1.5
--- src/distrib/utils/sysinst/arch/hp300/msg.md.es:1.4 Mon Apr 4 08:30:28 2011
+++ src/distrib/utils/sysinst/arch/hp300/msg.md.es Sat Mar 3 02:46:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.4 2011/04/04 08:30:28 mbalmer Exp $ */
+/* $NetBSD: msg.md.es,v 1.5 2012/03/03 02:46:13 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -48,13 +48,6 @@ message dobootblks
{Instalando bloques de arranque en %s
}
-message newdisk
-{Parece que su disco, %s, no tiene una marca de disco X68K. sysinst
-escribirá una marca de disco.
-Note que si pretende usar una parte de %s desde Human68k, debería abortar
-aqui y formatear el disco con la utilidad format.x de Human68k.
-}
-
message ordering
{El orden de la partición %c esta mal. ¿Editar de nuevo?}
Index: src/distrib/utils/sysinst/arch/hp300/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/hp300/msg.md.fr:1.7 src/distrib/utils/sysinst/arch/hp300/msg.md.fr:1.8
--- src/distrib/utils/sysinst/arch/hp300/msg.md.fr:1.7 Mon Apr 4 08:30:28 2011
+++ src/distrib/utils/sysinst/arch/hp300/msg.md.fr Sat Mar 3 02:46:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.7 2011/04/04 08:30:28 mbalmer Exp $ */
+/* $NetBSD: msg.md.fr,v 1.8 2012/03/03 02:46:13 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -47,13 +47,6 @@ message dobootblks
{Installation des blocs de démarrage sur %s ...
}
-message newdisk
-{Il apparaît que votre disque, %s, n'a pas de marque de disque X68K. sysinst
-écrit une marque de disque.
-Si vous comptez utiliser une partie de %s depuis Human68k, vous devriez annuler
-maintenant et formater le disque avec l'utilitaire format.x de Human68k.
-}
-
message ordering
{L'ordre de la partition %c est erroné. Modifier à nouveau ?}
Index: src/distrib/utils/sysinst/arch/hp300/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/hp300/msg.md.pl:1.7 src/distrib/utils/sysinst/arch/hp300/msg.md.pl:1.8
--- src/distrib/utils/sysinst/arch/hp300/msg.md.pl:1.7 Mon Apr 4 08:30:28 2011
+++ src/distrib/utils/sysinst/arch/hp300/msg.md.pl Sat Mar 3 02:46:13 2012
@@ -1,4 +1,4 @@
-/*
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: tsutsui
Date: Thu Mar 1 18:08:56 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/mac68k: msg.md.de msg.md.en msg.md.es
src/distrib/utils/sysinst/arch/x68k: msg.md.pl
Log Message:
Remove trailing spaces not in message format.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/mac68k/msg.md.de
cvs rdiff -u -r1.21 -r1.22 src/distrib/utils/sysinst/arch/mac68k/msg.md.en
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/mac68k/msg.md.es
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/x68k/msg.md.pl
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/mac68k/msg.md.de
diff -u src/distrib/utils/sysinst/arch/mac68k/msg.md.de:1.7 src/distrib/utils/sysinst/arch/mac68k/msg.md.de:1.8
--- src/distrib/utils/sysinst/arch/mac68k/msg.md.de:1.7 Thu Mar 1 16:22:15 2012
+++ src/distrib/utils/sysinst/arch/mac68k/msg.md.de Thu Mar 1 18:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.7 2012/03/01 16:22:15 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.8 2012/03/01 18:08:56 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -169,7 +169,7 @@ Festplatte geschrieben wurde, wird Sie b
Bitte starten Sie daher jetzt den Computer neu und führen Sie die Installation
erneut aus.
}
-
+
.if debug
message mapdebug
{Partitions Übersicht:
@@ -234,7 +234,7 @@ message parttable_fix_fixing
message parttable_fix_fine
{Partition %s%c ist bereits in Ordnung!\n}
-
+
message dump_line
{%s\n}
Index: src/distrib/utils/sysinst/arch/mac68k/msg.md.en
diff -u src/distrib/utils/sysinst/arch/mac68k/msg.md.en:1.21 src/distrib/utils/sysinst/arch/mac68k/msg.md.en:1.22
--- src/distrib/utils/sysinst/arch/mac68k/msg.md.en:1.21 Thu Mar 1 16:22:15 2012
+++ src/distrib/utils/sysinst/arch/mac68k/msg.md.en Thu Mar 1 18:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.21 2012/03/01 16:22:15 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.22 2012/03/01 18:08:56 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -163,7 +163,7 @@ disk partitions. However your new Disk P
the disk and will be available the next time NetBSD is booted. Please
reboot immediately and restart the Installation Process.
}
-
+
.if debug
message mapdebug
{Partition Map:
@@ -228,7 +228,7 @@ message parttable_fix_fixing
message parttable_fix_fine
{Partition %s%c is just fine!\n}
-
+
message dump_line
{%s\n}
Index: src/distrib/utils/sysinst/arch/mac68k/msg.md.es
diff -u src/distrib/utils/sysinst/arch/mac68k/msg.md.es:1.5 src/distrib/utils/sysinst/arch/mac68k/msg.md.es:1.6
--- src/distrib/utils/sysinst/arch/mac68k/msg.md.es:1.5 Thu Mar 1 16:22:15 2012
+++ src/distrib/utils/sysinst/arch/mac68k/msg.md.es Thu Mar 1 18:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.5 2012/03/01 16:22:15 mbalmer Exp $ */
+/* $NetBSD: msg.md.es,v 1.6 2012/03/01 18:08:56 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -172,7 +172,7 @@ de Disco ha sido escrita a disco y estar
NetBSD sea iniciado. Por favor reinicie inmediatamente y vuelva a iniciar
el Proceso de Instalacion.
}
-
+
.if debug
message mapdebug
{Mapa de Particiones:
@@ -237,7 +237,7 @@ message parttable_fix_fixing
message parttable_fix_fine
{¡La particion %s%c ya es correcta!\n}
-
+
message dump_line
{%s\n}
Index: src/distrib/utils/sysinst/arch/x68k/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/x68k/msg.md.pl:1.8 src/distrib/utils/sysinst/arch/x68k/msg.md.pl:1.9
--- src/distrib/utils/sysinst/arch/x68k/msg.md.pl:1.8 Thu Mar 1 16:22:16 2012
+++ src/distrib/utils/sysinst/arch/x68k/msg.md.pl Thu Mar 1 18:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.8 2012/03/01 16:22:16 mbalmer Exp $ */
+/* $NetBSD: msg.md.pl,v 1.9 2012/03/01 18:08:56 tsutsui Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.2 2002/12/03 01:54:57 minoura Exp */
@@ -63,6 +63,6 @@ message ordering
message emptypart
{Istnieje poprawna partycja %c po pustych partycjach.
Wyedytuj jeszcze raz tablice partycji.}
-
+
message set_kernel_1
{Kernel (GENERIC)}
CVS commit: src/distrib/utils/sysinst/arch/zaurus
Module Name:src
Committed By: tsutsui
Date: Thu Feb 2 16:00:35 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/zaurus: md.c md.h msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl
Log Message:
Select a proper kernel set (GENERIC or C700) per running INSTALL kernel name.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/zaurus/md.c
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/zaurus/md.h \
src/distrib/utils/sysinst/arch/zaurus/msg.md.fr \
src/distrib/utils/sysinst/arch/zaurus/msg.md.pl
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/zaurus/msg.md.de \
src/distrib/utils/sysinst/arch/zaurus/msg.md.en \
src/distrib/utils/sysinst/arch/zaurus/msg.md.es
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/zaurus/md.c
diff -u src/distrib/utils/sysinst/arch/zaurus/md.c:1.10 src/distrib/utils/sysinst/arch/zaurus/md.c:1.11
--- src/distrib/utils/sysinst/arch/zaurus/md.c:1.10 Mon Nov 7 14:18:52 2011
+++ src/distrib/utils/sysinst/arch/zaurus/md.c Thu Feb 2 16:00:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2011/11/07 14:18:52 he Exp $ */
+/* $NetBSD: md.c,v 1.11 2012/02/02 16:00:35 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -35,6 +35,7 @@
/* md.c -- zaurus machine specific routines */
#include sys/param.h
+#include sys/sysctl.h
#include stdio.h
#include util.h
@@ -52,7 +53,20 @@ md_init(void)
void
md_init_set_status(int flags)
{
- (void)flags;
+ static const int mib[2] = {CTL_KERN, KERN_VERSION};
+ size_t len;
+ char *version;
+
+ /* check INSTALL kernel name to select an appropriate kernel set */
+ /* XXX: hw.cpu_model has a processor name on arm ports */
+ sysctl(mib, 2, NULL, len, NULL, 0);
+ version = malloc(len);
+ if (version == NULL)
+ return;
+ sysctl(mib, 2, version, len, NULL, 0);
+ if (strstr(version, C700) != NULL)
+ set_kernel_set(SET_KERNEL_C700);
+ free(version);
}
int
Index: src/distrib/utils/sysinst/arch/zaurus/md.h
diff -u src/distrib/utils/sysinst/arch/zaurus/md.h:1.4 src/distrib/utils/sysinst/arch/zaurus/md.h:1.5
--- src/distrib/utils/sysinst/arch/zaurus/md.h:1.4 Thu Jan 26 16:12:14 2012
+++ src/distrib/utils/sysinst/arch/zaurus/md.h Thu Feb 2 16:00:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.4 2012/01/26 16:12:14 tsutsui Exp $ */
+/* $NetBSD: md.h,v 1.5 2012/02/02 16:00:35 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -57,8 +57,10 @@
* base etc comp games man misc tests text xbase xcomp xetc xfont xserver
*/
#define SET_KERNEL_GENERIC SET_KERNEL_1
+#define SET_KERNEL_C700 SET_KERNEL_2
#define SET_KERNEL_1_NAME kern-GENERIC
+#define SET_KERNEL_2_NAME kern-C700
/*
* Machine-specific command to write a new label to a disk.
Index: src/distrib/utils/sysinst/arch/zaurus/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/zaurus/msg.md.fr:1.4 src/distrib/utils/sysinst/arch/zaurus/msg.md.fr:1.5
--- src/distrib/utils/sysinst/arch/zaurus/msg.md.fr:1.4 Mon Apr 4 08:30:46 2011
+++ src/distrib/utils/sysinst/arch/zaurus/msg.md.fr Thu Feb 2 16:00:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.4 2011/04/04 08:30:46 mbalmer Exp $ */
+/* $NetBSD: msg.md.fr,v 1.5 2012/02/02 16:00:35 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -54,3 +54,6 @@ message zaurusfspart
message set_kernel_1
{Kernel (GENERIC)}
+
+message set_kernel_2
+{Kernel (C700)}
Index: src/distrib/utils/sysinst/arch/zaurus/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/zaurus/msg.md.pl:1.4 src/distrib/utils/sysinst/arch/zaurus/msg.md.pl:1.5
--- src/distrib/utils/sysinst/arch/zaurus/msg.md.pl:1.4 Mon Apr 4 08:30:46 2011
+++ src/distrib/utils/sysinst/arch/zaurus/msg.md.pl Thu Feb 2 16:00:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.4 2011/04/04 08:30:46 mbalmer Exp $ */
+/* $NetBSD: msg.md.pl,v 1.5 2012/02/02 16:00:35 tsutsui Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.1 2002/02/11 13:50:18 skrll Exp */
@@ -54,3 +54,6 @@ message zaurusfspart
message set_kernel_1
{Kernel (GENERIC)}
+
+message set_kernel_2
+{Kernel (C700)}
Index: src/distrib/utils/sysinst/arch/zaurus/msg.md.de
diff -u src/distrib/utils/sysinst/arch/zaurus/msg.md.de:1.3 src/distrib/utils/sysinst/arch/zaurus/msg.md.de:1.4
--- src/distrib/utils/sysinst/arch/zaurus/msg.md.de:1.3 Mon Apr 4 08:30:46 2011
+++ src/distrib/utils/sysinst/arch/zaurus/msg.md.de Thu Feb 2 16:00:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.3 2011/04/04 08:30:46 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.4 2012/02/02 16:00:35 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -53,3 +53,6 @@ message zaurusfspart
message set_kernel_1
{Kernel (GENERIC)}
+
+message set_kernel_2
+{Kernel (C700)}
Index: src/distrib/utils/sysinst/arch/zaurus/msg.md.en
diff -u
CVS commit: src/distrib/utils/sysinst/arch/ofppc
Module Name:src Committed By: phx Date: Thu Feb 2 21:58:31 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/ofppc: md.c Log Message: Use sync(8) instead of echo(1) to avoid writing an RDB disklabel. echo(1) is not part of the miniroot file system. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/sysinst/arch/ofppc/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/ofppc/md.c diff -u src/distrib/utils/sysinst/arch/ofppc/md.c:1.11 src/distrib/utils/sysinst/arch/ofppc/md.c:1.12 --- src/distrib/utils/sysinst/arch/ofppc/md.c:1.11 Sun Jan 29 16:01:36 2012 +++ src/distrib/utils/sysinst/arch/ofppc/md.c Thu Feb 2 21:58:31 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.11 2012/01/29 16:01:36 phx Exp $ */ +/* $NetBSD: md.c,v 1.12 2012/02/02 21:58:31 phx Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -605,7 +605,7 @@ const char *md_disklabel_cmd(void) /* we cannot rewrite an RDB disklabel */ if (rdb_found) - return echo No disklabel; + return sync No disklabel; return disklabel -w -r; }
CVS commit: src/distrib/utils/sysinst/arch/ofppc
Module Name:src
Committed By: phx
Date: Thu Feb 2 22:15:05 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/ofppc: msg.md.de
Log Message:
Translate some new messages into german.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/ofppc/msg.md.de
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/ofppc/msg.md.de
diff -u src/distrib/utils/sysinst/arch/ofppc/msg.md.de:1.7 src/distrib/utils/sysinst/arch/ofppc/msg.md.de:1.8
--- src/distrib/utils/sysinst/arch/ofppc/msg.md.de:1.7 Mon Apr 4 08:30:39 2011
+++ src/distrib/utils/sysinst/arch/ofppc/msg.md.de Thu Feb 2 22:15:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.7 2011/04/04 08:30:39 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.8 2012/02/02 22:15:04 phx Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -64,25 +64,26 @@ message set_kernel_1
{Kernel (GENERIC)}
message nobootpart
-{There is no boot partition in the MBR partition table.}
+{Es gibt keine Boot Partition in der MBR Partitionstabelle.}
message boottoosmall
-{The boot partition is too small. It needs to be at least 2MB in size,
-however a size of at least 100MB is recommended.}
+{Die Boot Partition ist zu klein. Sie benötigt mindestens 2MB,
+wobei eine Größe von 100MB empfohlen wird.}
message nobootpartdisklabel
-{There is no boot partition in the disklabel. The boot partition should
-match the boot partition you set up in the MBR partition table.}
+{Es gibt keine Boot Partition im Disklabel. Die Boot Partition sollte
+zu derjenigen passen, die Sie in der MBR Partitionstabelle angelegt haben.}
message preptoosmall
-{You need to have two PReP partitions to boot an IBM RS/6000. One needs to
-be at least 1MB in size, and the other must be at least 1KB in size.}
+{Sie benötigen zwei PReP Partitionen, um unter IBM RS/6000 booten zu können.
+Eine sollte mindestens 1MB groß sein, und die andere mindestens 1KB.}
message bootnotright
-{In order to boot ofppc, you need either a FAT12 partition of at least 2MB
-in size, or a pair of PReP partitions. The PReP partitions need to be at
-least 1KB, and 1MB in size. IBM RS/6000 machines generally need the PReP
-partitions, however some can utilize the FAT12. Most other machines require
-the FAT12 partition. If you are not sure which to choose, accept the
-defaults, and install all three. You do not currently have any partitions
-that meet the minimum requirements.}
+{Um ofppc booten zu können benötigen Sie entweder eine 2MB große FAT12
+Partition oder zwei PReP Partitionen. Die PReP Partitionen sollten
+mindestens eine Größe von 1KB und 1MB haben. IBM/RS6000 Maschinen benötigen
+meistens die PReP Partitionen, obwohl einige auch mit FAT12 zurecht kommen.
+Alle anderen Maschinen benötigen meistens die FAT12 Partition. Wenn Sie
+nicht sicher sind welche Sie benötigen, so akzeptieren Sie die Standard
+Einstellungen und installieren alle drei. Momentan haben Sie noch nicht
+genügend Partitionen um die Minimalanforderungen zu erfüllen.}
CVS commit: src/distrib/utils/sysinst/arch/evbarm
Module Name:src
Committed By: nisimura
Date: Fri Feb 3 00:35:35 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/evbarm: md.h msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl
Log Message:
Add Mini2440 entry to sysinst kernel selection.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/sysinst/arch/evbarm/md.h
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/evbarm/msg.md.de
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/evbarm/msg.md.en
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/evbarm/msg.md.es
cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/sysinst/arch/evbarm/msg.md.fr
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/evbarm/msg.md.pl
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/evbarm/md.h
diff -u src/distrib/utils/sysinst/arch/evbarm/md.h:1.17 src/distrib/utils/sysinst/arch/evbarm/md.h:1.18
--- src/distrib/utils/sysinst/arch/evbarm/md.h:1.17 Mon Apr 4 08:30:24 2011
+++ src/distrib/utils/sysinst/arch/evbarm/md.h Fri Feb 3 00:35:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.17 2011/04/04 08:30:24 mbalmer Exp $ */
+/* $NetBSD: md.h,v 1.18 2012/02/03 00:35:35 nisimura Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -49,8 +49,9 @@
#define SET_KERNEL_2_NAME kern-INTEGRATOR
#define SET_KERNEL_3_NAME kern-IQ80310
#define SET_KERNEL_4_NAME kern-IQ80321
-#define SET_KERNEL_5_NAME kern-TEAMASA_NPWR
-#define SET_KERNEL_6_NAME kern-TS7200
+#define SET_KERNEL_5_NAME kern-MINI2440
+#define SET_KERNEL_6_NAME kern-TEAMASA_NPWR
+#define SET_KERNEL_7_NAME kern-TS7200
#define MD_SETS_SELECTED SET_SYSTEM
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.de
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.de:1.8 src/distrib/utils/sysinst/arch/evbarm/msg.md.de:1.9
--- src/distrib/utils/sysinst/arch/evbarm/msg.md.de:1.8 Mon Apr 4 08:30:24 2011
+++ src/distrib/utils/sysinst/arch/evbarm/msg.md.de Fri Feb 3 00:35:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.8 2011/04/04 08:30:24 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.9 2012/02/03 00:35:35 nisimura Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -81,6 +81,8 @@ message set_kernel_3
message set_kernel_4
{Kernel (IQ80321)}
message set_kernel_5
-{Kernel (TEAMASA_NPWR)}
+{Kernel (MINI2440)}
message set_kernel_6
+{Kernel (TEAMASA_NPWR)}
+message set_kernel_7
{Kernel (TS7200)}
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.en
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.en:1.10 src/distrib/utils/sysinst/arch/evbarm/msg.md.en:1.11
--- src/distrib/utils/sysinst/arch/evbarm/msg.md.en:1.10 Mon Apr 4 08:30:24 2011
+++ src/distrib/utils/sysinst/arch/evbarm/msg.md.en Fri Feb 3 00:35:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.10 2011/04/04 08:30:24 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.11 2012/02/03 00:35:35 nisimura Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -77,6 +77,8 @@ message set_kernel_3
message set_kernel_4
{Kernel (IQ80321)}
message set_kernel_5
-{Kernel (TEAMASA_NPWR)}
+{Kernel (MINI2440)}
message set_kernel_6
+{Kernel (TEAMASA_NPWR)}
+message set_kernel_7
{Kernel (TS7200)}
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.es
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.es:1.7 src/distrib/utils/sysinst/arch/evbarm/msg.md.es:1.8
--- src/distrib/utils/sysinst/arch/evbarm/msg.md.es:1.7 Mon Apr 4 08:30:24 2011
+++ src/distrib/utils/sysinst/arch/evbarm/msg.md.es Fri Feb 3 00:35:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.7 2011/04/04 08:30:24 mbalmer Exp $ */
+/* $NetBSD: msg.md.es,v 1.8 2012/02/03 00:35:35 nisimura Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -80,6 +80,8 @@ message set_kernel_3
message set_kernel_4
{Núcleo (IQ80321)}
message set_kernel_5
-{Núcleo (TEAMASA_NPWR)}
+{Núcleo (MINI2440)}
message set_kernel_6
+{Núcleo (TEAMASA_NPWR)}
+message set_kernel_7
{Núcleo (TS7200)}
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.fr:1.11 src/distrib/utils/sysinst/arch/evbarm/msg.md.fr:1.12
--- src/distrib/utils/sysinst/arch/evbarm/msg.md.fr:1.11 Mon Apr 4 08:30:24 2011
+++ src/distrib/utils/sysinst/arch/evbarm/msg.md.fr Fri Feb 3 00:35:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.11 2011/04/04 08:30:24 mbalmer Exp $ */
+/* $NetBSD: msg.md.fr,v 1.12 2012/02/03 00:35:35 nisimura Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -80,6 +80,8 @@ message set_kernel_3
message set_kernel_4
{Kernel (IQ80321)}
message set_kernel_5
-{Kernel (TEAMASA_NPWR)}
+{Kernel (MINI2440)}
message set_kernel_6
+{Kernel (TEAMASA_NPWR)}
+message set_kernel_7
{Kernel (TS7200)}
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.pl:1.9
CVS commit: src/distrib/utils/sysinst/arch/ofppc
Module Name:src
Committed By: phx
Date: Sun Jan 29 16:01:37 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/ofppc: md.c md.h
Log Message:
Add support for RDB-partitioned disks.
When an RDB block was found on the disk we cannot change the disk layout,
and everything which has to do with MBR partitioning will be skipped.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/ofppc/md.c
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/ofppc/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/ofppc/md.c
diff -u src/distrib/utils/sysinst/arch/ofppc/md.c:1.10 src/distrib/utils/sysinst/arch/ofppc/md.c:1.11
--- src/distrib/utils/sysinst/arch/ofppc/md.c:1.10 Fri Nov 4 11:27:04 2011
+++ src/distrib/utils/sysinst/arch/ofppc/md.c Sun Jan 29 16:01:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2011/11/04 11:27:04 martin Exp $ */
+/* $NetBSD: md.c,v 1.11 2012/01/29 16:01:36 phx Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -36,6 +36,7 @@
#include sys/param.h
#include sys/sysctl.h
+#include sys/disklabel_rdb.h
#include stdio.h
#include util.h
#include machine/cpu.h
@@ -46,12 +47,16 @@
#include menu_defs.h
#include endian.h
+static int check_rdb(void);
+static uint32_t rdbchksum(void *);
+
/* We use MBR_PTYPE_PREP like port-prep does. */
static int nonewfsmsdos = 0, nobootfix = 0, noprepfix=0;
static int bootpart_fat12 = PART_BOOT_FAT12;
static int bootpart_binfo = PART_BOOT_BINFO;
static int bootpart_prep = PART_BOOT_PREP;
static int bootinfo_mbr = 1;
+static int rdb_found = 0;
/* bootstart/bootsize are for the fat */
int binfostart, binfosize, bprepstart, bprepsize;
@@ -64,12 +69,17 @@ md_init(void)
void
md_init_set_status(int flags)
{
+
(void)flags;
}
int
md_get_info(void)
{
+
+ if (check_rdb())
+ return 1;
+
return set_bios_geom_with_mbr_guess();
}
@@ -88,6 +98,41 @@ md_make_bsd_partitions(void)
int no_swap = 0;
partinfo *p;
+ if (rdb_found) {
+ /*
+ * We found RDB partitions on the disk, which cannot be
+ * modified by rewriting the disklabel.
+ * So just use what we have got.
+ */
+ for (part = 0; part maxpart; part++) {
+ if (PI_ISBSDFS(bsdlabel[part])) {
+bsdlabel[part].pi_flags |=
+PIF_NEWFS | PIF_MOUNT;
+
+if (part == PART_A)
+ strcpy(bsdlabel[part].pi_mount, /);
+ }
+ }
+
+ part_bsd = part_raw = getrawpartition();
+ if (part_raw == -1)
+ part_raw = PART_C; /* for sanity... */
+ bsdlabel[part_raw].pi_offset = 0;
+ bsdlabel[part_raw].pi_size = dlsize;
+
+ set_sizemultname_meg();
+rdb_edit_check:
+ if (edit_and_check_label(bsdlabel, maxpart, part_raw,
+ part_bsd) == 0) {
+ msg_display(MSG_abort);
+ return 0;
+ }
+ if (md_check_partitions() == 0)
+ goto rdb_edit_check;
+
+ return 1;
+ }
+
/*
* Initialize global variables that track space used on this disk.
* Standard 4.4BSD 8-partition labels always cover whole disk.
@@ -223,6 +268,9 @@ md_check_partitions(void)
{
int part, fprep=0, ffat=0;
+ if (rdb_found)
+ return 1;
+
/* we need to find a boot partition, otherwise we can't create
* our msdos fs boot partition. We make the assumption that
* the user hasn't done something stupid, like move it away
@@ -259,6 +307,10 @@ md_check_partitions(void)
int
md_pre_disklabel(void)
{
+
+ if (rdb_found)
+ return 0;
+
msg_display(MSG_dofdisk);
/* write edited MBR onto disk. */
@@ -278,7 +330,7 @@ md_post_disklabel(void)
{
char bootdev[100];
- if (bootstart == 0 || bootsize == 0)
+ if (bootstart == 0 || bootsize == 0 || rdb_found)
return 0;
snprintf(bootdev, sizeof bootdev, /dev/r%s%c, diskdev,
@@ -307,7 +359,7 @@ md_post_extract(void)
char bootdev[100], bootbdev[100], version[64];
/* if we can't make it bootable, just punt */
- if (nobootfix noprepfix)
+ if ((nobootfix noprepfix) || rdb_found)
return 0;
snprintf(version, sizeof version, NetBSD/%s %s, MACH, REL);
@@ -353,6 +405,7 @@ md_post_extract(void)
void
md_cleanup_install(void)
{
+
#ifndef DEBUG
enable_rc_conf();
#endif
@@ -365,6 +418,9 @@ md_pre_update(void)
mbr_info_t *ext;
int i;
+ if (check_rdb())
+ return 1;
+
read_mbr(diskdev, mbr);
/* do a sanity check of the partition table */
for (ext = mbr; ext; ext = ext-extended) {
@@ -400,6 +456,7 @@ md_pre_update(void)
int
md_update(void)
{
+
nonewfsmsdos = 1;
md_post_newfs();
return 1;
@@ -543,8 +600,56 @@ md_mbr_use_wholedisk(mbr_info_t *mbri)
return 1;
}
+const char *md_disklabel_cmd(void)
+{
+
+ /* we cannot rewrite an RDB disklabel */
+ if (rdb_found)
+ return echo No disklabel;
+
+ return disklabel -w -r;
+}
+
+static int
+check_rdb(void)
+{
+ char buf[512], diskpath[MAXPATHLEN];
+ struct rdblock *rdb;
+ off_t blk;
+ int fd;
+
+ /* Find out if this disk has a valid RDB, before continuing. */
+ rdb =
CVS commit: src/distrib/utils/sysinst/arch/zaurus
Module Name:src Committed By: tsutsui Date: Thu Jan 26 16:12:14 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/zaurus: md.h Log Message: zaurus zboot supports UFS2. (as defined in zaurus/stand/zboot/conf.c) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/zaurus/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/zaurus/md.h diff -u src/distrib/utils/sysinst/arch/zaurus/md.h:1.3 src/distrib/utils/sysinst/arch/zaurus/md.h:1.4 --- src/distrib/utils/sysinst/arch/zaurus/md.h:1.3 Mon Apr 4 08:30:46 2011 +++ src/distrib/utils/sysinst/arch/zaurus/md.h Thu Jan 26 16:12:14 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2011/04/04 08:30:46 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.4 2012/01/26 16:12:14 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -48,6 +48,9 @@ /* Megs required for a full X installation. */ #define XNEEDMB 60 +/* have support for booting from UFS2 */ +#define HAVE_UFS2_BOOT + /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are:
CVS commit: src/distrib/utils/sysinst/arch/sandpoint
Module Name:src
Committed By: phx
Date: Wed Jan 25 19:03:35 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/sandpoint: md.c
Log Message:
netboot is called altboot now
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/sysinst/arch/sandpoint/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/sandpoint/md.c
diff -u src/distrib/utils/sysinst/arch/sandpoint/md.c:1.38 src/distrib/utils/sysinst/arch/sandpoint/md.c:1.39
--- src/distrib/utils/sysinst/arch/sandpoint/md.c:1.38 Fri Jan 6 20:52:43 2012
+++ src/distrib/utils/sysinst/arch/sandpoint/md.c Wed Jan 25 19:03:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.38 2012/01/06 20:52:43 riz Exp $ */
+/* $NetBSD: md.c,v 1.39 2012/01/25 19:03:35 phx Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -153,7 +153,7 @@ md_post_disklabel(void)
int
md_post_newfs(void)
{
- /* no boot blocks, we are using netboot */
+ /* no boot blocks, we are using altboot */
return 0;
}
CVS commit: src/distrib/utils/sysinst/arch/hp700
Module Name:src
Committed By: skrll
Date: Mon Jan 9 11:51:41 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/hp700: md.c msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl
Log Message:
Error if the root partition exceeds the PDC 2GB limit. The check now
catches invalid existing partitions. PR/45742
Thanks to martin for the German translation. The others are all my fault.
Thanks to mrg for comments
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/sysinst/arch/hp700/md.c
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/hp700/msg.md.de \
src/distrib/utils/sysinst/arch/hp700/msg.md.en \
src/distrib/utils/sysinst/arch/hp700/msg.md.es \
src/distrib/utils/sysinst/arch/hp700/msg.md.pl
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/hp700/msg.md.fr
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/hp700/md.c
diff -u src/distrib/utils/sysinst/arch/hp700/md.c:1.13 src/distrib/utils/sysinst/arch/hp700/md.c:1.14
--- src/distrib/utils/sysinst/arch/hp700/md.c:1.13 Thu Jan 5 21:32:36 2012
+++ src/distrib/utils/sysinst/arch/hp700/md.c Mon Jan 9 11:51:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.13 2012/01/05 21:32:36 christos Exp $ */
+/* $NetBSD: md.c,v 1.14 2012/01/09 11:51:41 skrll Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,6 +50,8 @@
#include msg_defs.h
#include menu_defs.h
+#define HP700_PDC_LIMIT ((unsigned)2*1024*1024*1024)
+
void
md_init(void)
{
@@ -108,7 +110,7 @@ md_get_info(void)
/*
* hp700 PDC can only address up to 2GB.
*/
- root_limit = ((unsigned)2*1024*1024*1024) / (unsigned)sectorsize;
+ root_limit = HP700_PDC_LIMIT / (unsigned)sectorsize;
return 1;
}
@@ -128,6 +130,23 @@ md_make_bsd_partitions(void)
int
md_check_partitions(void)
{
+ /* Check the root partition is sane. */
+ uint32_t limit = HP700_PDC_LIMIT / (unsigned)sectorsize;
+ int part;
+
+ for (part = PART_A; part MAXPARTITIONS; part++) {
+ if (strcmp(bsdlabel[part].pi_mount, /) == 0) {
+ uint32_t offset = bsdlabel[part].pi_offset;
+ uint32_t size = bsdlabel[part].pi_size;
+
+ if (offset limit || offset + size limit) {
+msg_display(MSG_md_pdclimit);
+process_menu(MENU_ok, NULL);
+return 0;
+ }
+ }
+ }
+
return 1;
}
Index: src/distrib/utils/sysinst/arch/hp700/msg.md.de
diff -u src/distrib/utils/sysinst/arch/hp700/msg.md.de:1.5 src/distrib/utils/sysinst/arch/hp700/msg.md.de:1.6
--- src/distrib/utils/sysinst/arch/hp700/msg.md.de:1.5 Mon Apr 4 08:30:29 2011
+++ src/distrib/utils/sysinst/arch/hp700/msg.md.de Mon Jan 9 11:51:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.5 2011/04/04 08:30:29 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.6 2012/01/09 11:51:41 skrll Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,3 +50,6 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+
+message md_pdclimit
+{Die Root-Partition überschreitet die PDC Grenze von 2GB}
Index: src/distrib/utils/sysinst/arch/hp700/msg.md.en
diff -u src/distrib/utils/sysinst/arch/hp700/msg.md.en:1.5 src/distrib/utils/sysinst/arch/hp700/msg.md.en:1.6
--- src/distrib/utils/sysinst/arch/hp700/msg.md.en:1.5 Mon Apr 4 08:30:29 2011
+++ src/distrib/utils/sysinst/arch/hp700/msg.md.en Mon Jan 9 11:51:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.5 2011/04/04 08:30:29 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.6 2012/01/09 11:51:41 skrll Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,3 +50,6 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+
+message md_pdclimit
+{The root partition extends beyond the PDC limit of 2GB}
Index: src/distrib/utils/sysinst/arch/hp700/msg.md.es
diff -u src/distrib/utils/sysinst/arch/hp700/msg.md.es:1.5 src/distrib/utils/sysinst/arch/hp700/msg.md.es:1.6
--- src/distrib/utils/sysinst/arch/hp700/msg.md.es:1.5 Mon Apr 4 08:30:29 2011
+++ src/distrib/utils/sysinst/arch/hp700/msg.md.es Mon Jan 9 11:51:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.5 2011/04/04 08:30:29 mbalmer Exp $ */
+/* $NetBSD: msg.md.es,v 1.6 2012/01/09 11:51:41 skrll Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,3 +50,6 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+
+message md_pdclimit
+{La partición raíz se extiende más allá del límite de 2 GB PDC}
Index: src/distrib/utils/sysinst/arch/hp700/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/hp700/msg.md.pl:1.5 src/distrib/utils/sysinst/arch/hp700/msg.md.pl:1.6
--- src/distrib/utils/sysinst/arch/hp700/msg.md.pl:1.5 Mon Apr 4 08:30:29 2011
+++ src/distrib/utils/sysinst/arch/hp700/msg.md.pl Mon Jan 9 11:51:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.5 2011/04/04 08:30:29 mbalmer Exp $ */
+/* $NetBSD: msg.md.pl,v 1.6 2012/01/09 11:51:41 skrll Exp $ */
/* Based on english version: */
/*
CVS commit: src/distrib/utils/sysinst/arch/mac68k
Module Name:src Committed By: riz Date: Fri Jan 6 20:41:28 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/mac68k: md.c Log Message: Use getfslabelname() instead of trying to access fstypenames[] directly. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/distrib/utils/sysinst/arch/mac68k/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/mac68k/md.c diff -u src/distrib/utils/sysinst/arch/mac68k/md.c:1.60 src/distrib/utils/sysinst/arch/mac68k/md.c:1.61 --- src/distrib/utils/sysinst/arch/mac68k/md.c:1.60 Fri Nov 4 11:27:03 2011 +++ src/distrib/utils/sysinst/arch/mac68k/md.c Fri Jan 6 20:41:28 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.60 2011/11/04 11:27:03 martin Exp $ */ +/* $NetBSD: md.c,v 1.61 2012/01/06 20:41:28 riz Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -336,7 +336,7 @@ md_make_bsd_partitions(void) (void)fprintf (f, \t:p%c#%d:o%c#%d:t%c=%s:, 'a'+i, bsdlabel[i].pi_size, 'a'+i, bsdlabel[i].pi_offset, - 'a'+i, fstypenames[bsdlabel[i].pi_fstype]); + 'a'+i, getfslabelname(bsdlabel[i].pi_fstype)); if (bsdlabel[i].pi_fstype == FS_BSDFFS) (void)fprintf (f, b%c#%d:f%c#%d, 'a'+i, bsdlabel[i].pi_fsize * bsdlabel[i].pi_frag,
CVS commit: src/distrib/utils/sysinst/arch/sandpoint
Module Name:src
Committed By: riz
Date: Fri Jan 6 20:52:43 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/sandpoint: md.c
Log Message:
Don't use snprintf() to format, when run_program() will do it nicely on
its own. Suggested by joerg.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/sysinst/arch/sandpoint/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/sandpoint/md.c
diff -u src/distrib/utils/sysinst/arch/sandpoint/md.c:1.37 src/distrib/utils/sysinst/arch/sandpoint/md.c:1.38
--- src/distrib/utils/sysinst/arch/sandpoint/md.c:1.37 Fri Nov 4 11:27:04 2011
+++ src/distrib/utils/sysinst/arch/sandpoint/md.c Fri Jan 6 20:52:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.37 2011/11/04 11:27:04 martin Exp $ */
+/* $NetBSD: md.c,v 1.38 2012/01/06 20:52:43 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -168,7 +168,6 @@ md_cleanup_install(void)
{
#ifndef DEBUG
int new_speed;
- char sed_cmd[64];
enable_rc_conf();
@@ -187,9 +186,8 @@ md_cleanup_install(void)
new_speed = 0;
if (new_speed != 0) {
- snprintf(sed_cmd, 64, sed -an -e 's/115200/%d/;H;$!d;g;w
+ run_program(RUN_CHROOT, sed -an -e 's/115200/%d/;H;$!d;g;w
/etc/ttys' /etc/ttys, new_speed);
- run_program(RUN_CHROOT, sed_cmd);
}
#endif
}
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: christos
Date: Thu Jan 5 21:32:37 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/emips: md.c
src/distrib/utils/sysinst/arch/hp300: md.c
src/distrib/utils/sysinst/arch/hp700: md.c
src/distrib/utils/sysinst/arch/mipsco: md.c
src/distrib/utils/sysinst/arch/mvme68k: md.c
src/distrib/utils/sysinst/arch/pmax: md.c
src/distrib/utils/sysinst/arch/sgimips: md.c
src/distrib/utils/sysinst/arch/sparc: md.c
src/distrib/utils/sysinst/arch/sparc64: md.c
src/distrib/utils/sysinst/arch/vax: md.c
src/distrib/utils/sysinst/arch/x68k: md.c
Log Message:
eliminate logging variable from md code.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/emips/md.c
cvs rdiff -u -r1.31 -r1.32 src/distrib/utils/sysinst/arch/hp300/md.c
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/sysinst/arch/hp700/md.c
cvs rdiff -u -r1.19 -r1.20 src/distrib/utils/sysinst/arch/mipsco/md.c
cvs rdiff -u -r1.26 -r1.27 src/distrib/utils/sysinst/arch/mvme68k/md.c
cvs rdiff -u -r1.66 -r1.67 src/distrib/utils/sysinst/arch/pmax/md.c
cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/sysinst/arch/sgimips/md.c
cvs rdiff -u -r1.51 -r1.52 src/distrib/utils/sysinst/arch/sparc/md.c
cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/sysinst/arch/sparc64/md.c
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/sysinst/arch/vax/md.c
cvs rdiff -u -r1.42 -r1.43 src/distrib/utils/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/distrib/utils/sysinst/arch/emips/md.c
diff -u src/distrib/utils/sysinst/arch/emips/md.c:1.4 src/distrib/utils/sysinst/arch/emips/md.c:1.5
--- src/distrib/utils/sysinst/arch/emips/md.c:1.4 Fri Nov 4 07:27:02 2011
+++ src/distrib/utils/sysinst/arch/emips/md.c Thu Jan 5 16:32:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2011/11/04 11:27:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.5 2012/01/05 21:32:35 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -70,14 +70,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, Can't open %s\n, dev_name);
endwin();
fprintf(stderr, Can't open %s\n, dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, Can't read disklabel on %s.\n,
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/hp300/md.c
diff -u src/distrib/utils/sysinst/arch/hp300/md.c:1.31 src/distrib/utils/sysinst/arch/hp300/md.c:1.32
--- src/distrib/utils/sysinst/arch/hp300/md.c:1.31 Fri Nov 4 07:27:02 2011
+++ src/distrib/utils/sysinst/arch/hp300/md.c Thu Jan 5 16:32:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.31 2011/11/04 11:27:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.32 2012/01/05 21:32:35 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -70,14 +70,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, Can't open %s\n, dev_name);
endwin();
fprintf(stderr, Can't open %s\n, dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, Can't read disklabel on %s.\n,
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/hp700/md.c
diff -u src/distrib/utils/sysinst/arch/hp700/md.c:1.12 src/distrib/utils/sysinst/arch/hp700/md.c:1.13
--- src/distrib/utils/sysinst/arch/hp700/md.c:1.12 Fri Nov 4 07:27:02 2011
+++ src/distrib/utils/sysinst/arch/hp700/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.12 2011/11/04 11:27:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.13 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -72,14 +72,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, Can't open %s\n, dev_name);
endwin();
fprintf(stderr, Can't open %s\n, dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, Can't read disklabel on %s.\n,
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/mipsco/md.c
diff -u src/distrib/utils/sysinst/arch/mipsco/md.c:1.19 src/distrib/utils/sysinst/arch/mipsco/md.c:1.20
--- src/distrib/utils/sysinst/arch/mipsco/md.c:1.19 Fri Nov 4 07:27:03 2011
+++ src/distrib/utils/sysinst/arch/mipsco/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.19 2011/11/04 11:27:03 martin Exp $ */
+/* $NetBSD: md.c,v 1.20 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -71,14 +71,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd 0) {
- if (logging)
+ if
CVS commit: src/distrib/utils/sysinst/arch/vax
Module Name:src
Committed By: he
Date: Mon Nov 7 12:40:26 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/vax: md.c
Log Message:
Return 0 from md_pre_mount(), which is otherwise empty here, so that
this builds again.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 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/vax/md.c
diff -u src/distrib/utils/sysinst/arch/vax/md.c:1.37 src/distrib/utils/sysinst/arch/vax/md.c:1.38
--- src/distrib/utils/sysinst/arch/vax/md.c:1.37 Fri Nov 4 11:27:05 2011
+++ src/distrib/utils/sysinst/arch/vax/md.c Mon Nov 7 12:40:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.37 2011/11/04 11:27:05 martin Exp $ */
+/* $NetBSD: md.c,v 1.38 2011/11/07 12:40:26 he Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -193,4 +193,5 @@ md_update(void)
int
md_pre_mount()
{
+ return 0;
}
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: he
Date: Mon Nov 7 14:18:52 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/x68k: md.c
src/distrib/utils/sysinst/arch/zaurus: md.c
Log Message:
Two more instances which need return 0; to fix the build.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/utils/sysinst/arch/x68k/md.c
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/zaurus/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/x68k/md.c
diff -u src/distrib/utils/sysinst/arch/x68k/md.c:1.41 src/distrib/utils/sysinst/arch/x68k/md.c:1.42
--- src/distrib/utils/sysinst/arch/x68k/md.c:1.41 Fri Nov 4 11:27:05 2011
+++ src/distrib/utils/sysinst/arch/x68k/md.c Mon Nov 7 14:18:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.41 2011/11/04 11:27:05 martin Exp $ */
+/* $NetBSD: md.c,v 1.42 2011/11/07 14:18:51 he Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -331,4 +331,5 @@ md_newdisk(void)
int
md_pre_mount()
{
+ return 0;
}
Index: src/distrib/utils/sysinst/arch/zaurus/md.c
diff -u src/distrib/utils/sysinst/arch/zaurus/md.c:1.9 src/distrib/utils/sysinst/arch/zaurus/md.c:1.10
--- src/distrib/utils/sysinst/arch/zaurus/md.c:1.9 Fri Nov 4 11:27:05 2011
+++ src/distrib/utils/sysinst/arch/zaurus/md.c Mon Nov 7 14:18:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2011/11/04 11:27:05 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2011/11/07 14:18:52 he Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -193,4 +193,5 @@ md_mbr_use_wholedisk(mbr_info_t *mbri)
int
md_pre_mount()
{
+ return 0;
}
CVS commit: src/distrib/utils/sysinst/arch/acorn32
Module Name:src
Committed By: christos
Date: Wed Sep 14 12:35:19 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/acorn32: md.c
Log Message:
fix fprintfs with no format strings.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/utils/sysinst/arch/acorn32/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/acorn32/md.c
diff -u src/distrib/utils/sysinst/arch/acorn32/md.c:1.27 src/distrib/utils/sysinst/arch/acorn32/md.c:1.28
--- src/distrib/utils/sysinst/arch/acorn32/md.c:1.27 Mon Apr 4 04:30:15 2011
+++ src/distrib/utils/sysinst/arch/acorn32/md.c Wed Sep 14 08:35:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.27 2011/04/04 08:30:15 mbalmer Exp $ */
+/* $NetBSD: md.c,v 1.28 2011/09/14 12:35:19 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -96,7 +96,7 @@
if (lseek(fd, (off_t)FILECORE_BOOT_SECTOR * DEV_BSIZE, SEEK_SET) 0
|| read(fd, bb, sizeof(bb)) - sizeof(bb) != 0) {
endwin();
- fprintf(stderr, msg_string(MSG_badreadbb));
+ fprintf(stderr, %s, msg_string(MSG_badreadbb));
close(fd);
exit(1);
}
@@ -129,7 +129,8 @@
if (lseek(fd, (off_t)offset * DEV_BSIZE, SEEK_SET) 0
|| read(fd, bb, sizeof(bb)) - sizeof(bb) != 0) {
endwin();
-fprintf(stderr, msg_string(MSG_badreadriscix));
+fprintf(stderr, %s,
+msg_string(MSG_badreadriscix));
close(fd);
exit(1);
}
@@ -151,7 +152,8 @@
* leave this disc alone.
*/
endwin();
-fprintf(stderr, msg_string(MSG_notnetbsdriscix));
+fprintf(stderr, %s,
+msg_string(MSG_notnetbsdriscix));
close(fd);
exit(1);
}
@@ -164,7 +166,7 @@
* the filecore boot block first with dd.
*/
endwin();
- fprintf(stderr, msg_string(MSG_notnetbsd));
+ fprintf(stderr, %s, msg_string(MSG_notnetbsd));
close(fd);
exit(1);
}
CVS commit: src/distrib/utils/sysinst/arch/bebox
Module Name:src
Committed By: kiyohara
Date: Thu Aug 25 15:42:33 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/bebox: md.c
Log Message:
bebox not support md_post_newfs() and md_post_disklabel() now. Change null-func.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/distrib/utils/sysinst/arch/bebox/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/bebox/md.c
diff -u src/distrib/utils/sysinst/arch/bebox/md.c:1.55 src/distrib/utils/sysinst/arch/bebox/md.c:1.56
--- src/distrib/utils/sysinst/arch/bebox/md.c:1.55 Mon Apr 4 08:30:20 2011
+++ src/distrib/utils/sysinst/arch/bebox/md.c Thu Aug 25 15:42:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.55 2011/04/04 08:30:20 mbalmer Exp $ */
+/* $NetBSD: md.c,v 1.56 2011/08/25 15:42:33 kiyohara Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -102,12 +102,6 @@
int
md_post_disklabel(void)
{
- /* Sector forwarding / badblocks ... */
- if (*doessf) {
- printf (%s, msg_string (MSG_dobad144));
- return run_program(RUN_DISPLAY, /usr/sbin/bad144 %s 0,
- diskdev);
- }
return 0;
}
@@ -119,11 +113,6 @@
int
md_post_newfs(void)
{
- /* boot blocks ... */
- printf (msg_string(MSG_dobootblks), diskdev);
- run_program(RUN_DISPLAY,
- /usr/mdec/installboot -v /usr/mdec/biosboot.sym /dev/r%sa,
- diskdev);
return 0;
}
CVS commit: src/distrib/utils/sysinst/arch/ofppc
Module Name:src
Committed By: phx
Date: Sun Aug 21 13:40:08 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/ofppc: md.c
Log Message:
Unmounting /targetroot in md_post_newfs() is not needed.
Use target_prefix() instead of /mnt2 in md_post_extract().
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/ofppc/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/ofppc/md.c
diff -u src/distrib/utils/sysinst/arch/ofppc/md.c:1.8 src/distrib/utils/sysinst/arch/ofppc/md.c:1.9
--- src/distrib/utils/sysinst/arch/ofppc/md.c:1.8 Mon Apr 4 08:30:39 2011
+++ src/distrib/utils/sysinst/arch/ofppc/md.c Sun Aug 21 13:40:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 2011/04/04 08:30:39 mbalmer Exp $ */
+/* $NetBSD: md.c,v 1.9 2011/08/21 13:40:08 phx Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -297,8 +297,7 @@
md_post_newfs(void)
{
- /* just in case */
- run_program(RUN_DISPLAY, /sbin/umount /targetroot/boot);
+ /* No bootblock. We use ofwboot from a partition visiable by OFW. */
return 0;
}
@@ -316,25 +315,16 @@
/tmp/bootinfo.txt, version, bootinfo_mbr);
if (!nobootfix) {
- snprintf(bootdev, sizeof bootdev, /dev/r%s%c, diskdev,
- 'a'+bootpart_fat12);
- snprintf(bootbdev, sizeof bootbdev, /dev/%s%c, diskdev,
- 'a'+bootpart_fat12);
-
- if (nonewfsmsdos == 0)
- run_program(RUN_DISPLAY, /sbin/newfs_msdos %s,
- bootdev);
- run_program(RUN_DISPLAY, /sbin/mount_msdos %s /mnt2,
- bootbdev);
- run_program(RUN_DISPLAY, /bin/mkdir -p /mnt2/ppc);
- run_program(RUN_DISPLAY, /bin/mkdir -p /mnt2/netbsd);
+ run_program(RUN_DISPLAY, /bin/mkdir -p /%s/boot/ppc,
+ target_prefix());
+ run_program(RUN_DISPLAY, /bin/mkdir -p /%s/boot/netbsd,
+ target_prefix());
run_program(RUN_DISPLAY, /bin/cp /usr/mdec/ofwboot
- /mnt2/netbsd);
+ /%s/boot/netbsd, target_prefix());
run_program(RUN_DISPLAY, /bin/cp /tmp/bootinfo.txt
- /mnt2/ppc);
- run_program(RUN_DISPLAY,
- /bin/cp /usr/mdec/ofwboot /mnt2/ofwboot);
- run_program(RUN_DISPLAY, /sbin/umount /mnt2);
+ /%s/boot/ppc, target_prefix());
+ run_program(RUN_DISPLAY, /bin/cp /usr/mdec/ofwboot
+ /%s/boot/ofwboot, target_prefix());
}
if (!noprepfix) {
CVS commit: src/distrib/utils/sysinst/arch/ofppc
Module Name:src Committed By: phx Date: Sun Aug 21 15:21:46 UTC 2011 Modified Files: src/distrib/utils/sysinst/arch/ofppc: md.h Log Message: The ofppc generic kernel has tmpfs, so use it. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/ofppc/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/ofppc/md.h diff -u src/distrib/utils/sysinst/arch/ofppc/md.h:1.5 src/distrib/utils/sysinst/arch/ofppc/md.h:1.6 --- src/distrib/utils/sysinst/arch/ofppc/md.h:1.5 Mon Apr 4 08:30:39 2011 +++ src/distrib/utils/sysinst/arch/ofppc/md.h Sun Aug 21 15:21:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.5 2011/04/04 08:30:39 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.6 2011/08/21 15:21:46 phx Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -72,6 +72,8 @@ #define DEFUSRSIZE 256 /* Default /usr size, if /home */ #define XNEEDMB 120 /* Extra megs for full X installation */ +/* allow using tmpfs for /tmp instead of mfs */ +#define HAVE_TMPFS /* * Default filesets to fetch and install during installation
CVS commit: src/distrib/utils/sysinst/arch/news68k
Module Name:src
Committed By: tsutsui
Date: Sat Jul 16 23:49:10 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/news68k: md.c
Log Message:
Some style nits.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/distrib/utils/sysinst/arch/news68k/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/news68k/md.c
diff -u src/distrib/utils/sysinst/arch/news68k/md.c:1.32 src/distrib/utils/sysinst/arch/news68k/md.c:1.33
--- src/distrib/utils/sysinst/arch/news68k/md.c:1.32 Mon Apr 4 08:30:37 2011
+++ src/distrib/utils/sysinst/arch/news68k/md.c Sat Jul 16 23:49:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.32 2011/04/04 08:30:37 mbalmer Exp $ */
+/* $NetBSD: md.c,v 1.33 2011/07/16 23:49:10 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -57,6 +57,7 @@
void
md_init_set_status(int flags)
{
+
(void)flags;
}
@@ -67,17 +68,17 @@
int fd;
char dev_name[100];
- snprintf (dev_name, 100, /dev/r%sc, diskdev);
+ snprintf(dev_name, sizeof(dev_name), /dev/r%sc, diskdev);
- fd = open (dev_name, O_RDONLY, 0);
+ fd = open(dev_name, O_RDONLY, 0);
if (fd 0) {
endwin();
- fprintf (stderr, Can't open %s\n, dev_name);
+ fprintf(stderr, Can't open %s\n, dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, disklabel) == -1) {
endwin();
- fprintf (stderr, Can't read disklabel on %s.\n, dev_name);
+ fprintf(stderr, Can't read disklabel on %s.\n, dev_name);
close(fd);
exit(1);
}
@@ -95,7 +96,7 @@
* (If our new label's RAW_PART size ends up smaller than the
* in-core RAW_PART size value, updating the label will fail.)
*/
- dlsize = dlcyl*dlhead*dlsec;
+ dlsize = dlcyl * dlhead * dlsec;
if (disklabel.d_secperunit dlsize)
dlsize = disklabel.d_secperunit;
@@ -108,6 +109,7 @@
int
md_make_bsd_partitions(void)
{
+
return make_bsd_partitions();
}
@@ -117,6 +119,7 @@
int
md_check_partitions(void)
{
+
return 1;
}
@@ -126,6 +129,7 @@
int
md_pre_disklabel(void)
{
+
return 0;
}
@@ -135,6 +139,7 @@
int
md_post_disklabel(void)
{
+
return 0;
}
@@ -161,12 +166,14 @@
int
md_post_extract(void)
{
+
return 0;
}
void
md_cleanup_install(void)
{
+
#ifndef DEBUG
enable_rc_conf();
#endif
@@ -175,6 +182,7 @@
int
md_pre_update(void)
{
+
return 1;
}
@@ -182,6 +190,7 @@
int
md_update(void)
{
+
md_post_newfs();
return 1;
}
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: nonaka
Date: Sat Jun 11 11:43:23 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/hpcarm: md.c
src/distrib/utils/sysinst/arch/zaurus: md.c
Log Message:
MBR magic exists at the beginning of 'a' partition, BPB is cleared.
Avoid to detect msdosfs incorrectly at boot time.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/hpcarm/md.c
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/zaurus/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/hpcarm/md.c
diff -u src/distrib/utils/sysinst/arch/hpcarm/md.c:1.10 src/distrib/utils/sysinst/arch/hpcarm/md.c:1.11
--- src/distrib/utils/sysinst/arch/hpcarm/md.c:1.10 Mon Apr 4 08:30:29 2011
+++ src/distrib/utils/sysinst/arch/hpcarm/md.c Sat Jun 11 11:43:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2011/04/04 08:30:29 mbalmer Exp $ */
+/* $NetBSD: md.c,v 1.11 2011/06/11 11:43:23 nonaka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -148,6 +148,38 @@
int
md_post_newfs(void)
{
+ struct mbr_sector pbr;
+ char adevname[STRSIZE];
+ ssize_t sz;
+ int fd = -1;
+
+ snprintf(adevname, sizeof(adevname), /dev/r%sa, diskdev);
+ fd = open(adevname, O_RDWR);
+ if (fd 0)
+ goto out;
+
+ /* Read partition boot record */
+ sz = pread(fd, pbr, sizeof(pbr), 0);
+ if (sz != sizeof(pbr))
+ goto out;
+
+ /* Check magic number */
+ if (pbr.mbr_magic != le16toh(MBR_MAGIC))
+ goto out;
+
+#define OSNAME NetBSD60
+ /* Update oemname */
+ memcpy(pbr.mbr_oemname, OSNAME, sizeof(OSNAME) - 1);
+
+ /* Clear BPB */
+ memset(pbr.mbr_bpb, 0, sizeof(pbr.mbr_bpb));
+
+ /* write-backed new patition boot record */
+ (void)pwrite(fd, pbr, sizeof(pbr), 0);
+
+out:
+ if (fd = 0)
+ close(fd);
return 0;
}
Index: src/distrib/utils/sysinst/arch/zaurus/md.c
diff -u src/distrib/utils/sysinst/arch/zaurus/md.c:1.7 src/distrib/utils/sysinst/arch/zaurus/md.c:1.8
--- src/distrib/utils/sysinst/arch/zaurus/md.c:1.7 Mon Apr 4 08:30:46 2011
+++ src/distrib/utils/sysinst/arch/zaurus/md.c Sat Jun 11 11:43:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2011/04/04 08:30:46 mbalmer Exp $ */
+/* $NetBSD: md.c,v 1.8 2011/06/11 11:43:23 nonaka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -111,6 +111,38 @@
int
md_post_newfs(void)
{
+ struct mbr_sector pbr;
+ char adevname[STRSIZE];
+ ssize_t sz;
+ int fd = -1;
+
+ snprintf(adevname, sizeof(adevname), /dev/r%sa, diskdev);
+ fd = open(adevname, O_RDWR);
+ if (fd 0)
+ goto out;
+
+ /* Read partition boot record */
+ sz = pread(fd, pbr, sizeof(pbr), 0);
+ if (sz != sizeof(pbr))
+ goto out;
+
+ /* Check magic number */
+ if (pbr.mbr_magic != le16toh(MBR_MAGIC))
+ goto out;
+
+#define OSNAME NetBSD60
+ /* Update oemname */
+ memcpy(pbr.mbr_oemname, OSNAME, sizeof(OSNAME) - 1);
+
+ /* Clear BPB */
+ memset(pbr.mbr_bpb, 0, sizeof(pbr.mbr_bpb));
+
+ /* write-backed new patition boot record */
+ (void)pwrite(fd, pbr, sizeof(pbr), 0);
+
+out:
+ if (fd = 0)
+ close(fd);
return 0;
}
CVS commit: src/distrib/utils/sysinst/arch/sandpoint
Module Name:src Committed By: phx Date: Sat Mar 26 22:16:33 UTC 2011 Modified Files: src/distrib/utils/sysinst/arch/sandpoint: md.c Log Message: Remove debugging output. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/distrib/utils/sysinst/arch/sandpoint/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/sandpoint/md.c diff -u src/distrib/utils/sysinst/arch/sandpoint/md.c:1.34 src/distrib/utils/sysinst/arch/sandpoint/md.c:1.35 --- src/distrib/utils/sysinst/arch/sandpoint/md.c:1.34 Sun Mar 20 12:43:40 2011 +++ src/distrib/utils/sysinst/arch/sandpoint/md.c Sat Mar 26 22:16:33 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.34 2011/03/20 12:43:40 phx Exp $ */ +/* $NetBSD: md.c,v 1.35 2011/03/26 22:16:33 phx Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -80,7 +80,6 @@ } prodname = malloc(len); sysctlbyname(mib_name, prodname, len, NULL, 0); -printf(\n***\n*** Installing on %s\n***\n, prodname); if (strcmp(prodname, kurobox) == 0) /*
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: riz
Date: Fri Mar 25 22:56:35 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/acorn26: msg.md.pl
src/distrib/utils/sysinst/arch/acorn32: msg.md.pl
src/distrib/utils/sysinst/arch/alpha: msg.md.pl
src/distrib/utils/sysinst/arch/bebox: msg.md.pl
Log Message:
Fix pasto/sed errors, so acorn26/acorn32/alpha/bebox
builds can complete.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/acorn26/msg.md.pl
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/acorn32/msg.md.pl
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/alpha/msg.md.pl
cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/sysinst/arch/bebox/msg.md.pl
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/acorn26/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/acorn26/msg.md.pl:1.6 src/distrib/utils/sysinst/arch/acorn26/msg.md.pl:1.7
--- src/distrib/utils/sysinst/arch/acorn26/msg.md.pl:1.6 Thu Mar 24 22:08:29 2011
+++ src/distrib/utils/sysinst/arch/acorn26/msg.md.pl Fri Mar 25 22:56:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.6 2011/03/24 22:08:29 martin Exp $ */
+/* $NetBSD: msg.md.pl,v 1.7 2011/03/25 22:56:34 riz Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.2 2002/04/02 17:11:21 thorpej Exp */
@@ -47,10 +47,6 @@
}
message md_may_remove_boot_medium
-{
-}
-
-message md_may_remove_boot_mediu
{Jesli uruchomiles komputer z dyskietki, mozesz ja teraz wyciagnac.
}
Index: src/distrib/utils/sysinst/arch/acorn32/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/acorn32/msg.md.pl:1.9 src/distrib/utils/sysinst/arch/acorn32/msg.md.pl:1.10
--- src/distrib/utils/sysinst/arch/acorn32/msg.md.pl:1.9 Thu Mar 24 22:08:29 2011
+++ src/distrib/utils/sysinst/arch/acorn32/msg.md.pl Fri Mar 25 22:56:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.9 2011/03/24 22:08:29 martin Exp $ */
+/* $NetBSD: msg.md.pl,v 1.10 2011/03/25 22:56:34 riz Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.2 2002/04/02 17:11:21 thorpej Exp */
@@ -47,10 +47,6 @@
}
message md_may_remove_boot_medium
-{
-}
-
-message md_may_remove_boot_mediu
{Jesli uruchomiles komputer z dyskietki, mozesz ja teraz wyciagnac.
}
Index: src/distrib/utils/sysinst/arch/alpha/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/alpha/msg.md.pl:1.7 src/distrib/utils/sysinst/arch/alpha/msg.md.pl:1.8
--- src/distrib/utils/sysinst/arch/alpha/msg.md.pl:1.7 Thu Mar 24 22:08:29 2011
+++ src/distrib/utils/sysinst/arch/alpha/msg.md.pl Fri Mar 25 22:56:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.7 2011/03/24 22:08:29 martin Exp $ */
+/* $NetBSD: msg.md.pl,v 1.8 2011/03/25 22:56:34 riz Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.6 2000/12/03 01:54:47 minoura Exp */
@@ -47,10 +47,6 @@
}
message md_may_remove_boot_medium
-{
-}
-
-message md_may_remove_boot_mediu
{Jesli uruchomiles komputer z dyskietki, mozesz ja teraz wyciagnac.
}
Index: src/distrib/utils/sysinst/arch/bebox/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/bebox/msg.md.pl:1.11 src/distrib/utils/sysinst/arch/bebox/msg.md.pl:1.12
--- src/distrib/utils/sysinst/arch/bebox/msg.md.pl:1.11 Thu Mar 24 22:08:30 2011
+++ src/distrib/utils/sysinst/arch/bebox/msg.md.pl Fri Mar 25 22:56:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.11 2011/03/24 22:08:30 martin Exp $ */
+/* $NetBSD: msg.md.pl,v 1.12 2011/03/25 22:56:35 riz Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.11 2001/04/12 03:48:13 briggs Exp */
@@ -45,10 +45,6 @@
}
message md_may_remove_boot_medium
-{
-}
-
-message md_may_remove_boot_mediu
{Jesli uruchomiles komputer z dyskietki, mozesz ja teraz wyciagnac.
}
CVS commit: src/distrib/utils/sysinst/arch/sandpoint
Module Name:src
Committed By: phx
Date: Sun Mar 20 12:43:40 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/sandpoint: md.c
Log Message:
Use sysctl-node machdep.prodfamily to decide about the kernel to install and
to fix the console speed in /etc/ttys.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/distrib/utils/sysinst/arch/sandpoint/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/sandpoint/md.c
diff -u src/distrib/utils/sysinst/arch/sandpoint/md.c:1.33 src/distrib/utils/sysinst/arch/sandpoint/md.c:1.34
--- src/distrib/utils/sysinst/arch/sandpoint/md.c:1.33 Tue Feb 1 01:42:14 2011
+++ src/distrib/utils/sysinst/arch/sandpoint/md.c Sun Mar 20 12:43:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.33 2011/02/01 01:42:14 joerg Exp $ */
+/* $NetBSD: md.c,v 1.34 2011/03/20 12:43:40 phx Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,7 +41,9 @@
#include sys/param.h
#include sys/sysctl.h
#include sys/utsname.h
+
#include stdio.h
+#include string.h
#include util.h
#include defs.h
@@ -49,6 +51,8 @@
#include msg_defs.h
#include menu_defs.h
+static char *prodname;
+
void
md_init(void)
{
@@ -57,26 +61,35 @@
void
md_init_set_status(int flags)
{
- struct utsname instsys;
+ static const char mib_name[] = machdep.prodfamily;
+ static char unknown[] = unknown;
+ size_t len;
(void)flags;
/*
- * Get the name of the Install Kernel we are running under and
+ * Determine the product family of the board we are running on and
* enable the installation of the corresponding GENERIC kernel.
*
* Note: In md.h the two kernels are disabled. If they are
*enabled there the logic here needs to be switched.
*/
-uname(instsys);
-if (strstr(instsys.version, (INSTALL_KURO)))
+ if (sysctlbyname(mib_name, NULL, len, NULL, 0) != 0) {
+ prodname = unknown;
+ return;
+ }
+ prodname = malloc(len);
+ sysctlbyname(mib_name, prodname, len, NULL, 0);
+printf(\n***\n*** Installing on %s\n***\n, prodname);
+
+ if (strcmp(prodname, kurobox) == 0)
/*
- * Running the KuroBox Installation Kernel, so enable KUROBOX
+ * Running on a KuroBox family product, so enable KUROBOX
*/
set_kernel_set(SET_KERNEL_2);
else
/*
- * Running the GENERIC Installation Kernel, so enable GENERIC
+ * Otherwise enable GENERIC
*/
set_kernel_set(SET_KERNEL_1);
}
@@ -159,15 +172,30 @@
md_cleanup_install(void)
{
#ifndef DEBUG
+ int new_speed;
+ char sed_cmd[64];
+
enable_rc_conf();
/*
- * For KUROBOX set the console speed to 57600 in /etc/ttys.
+ * Set the console speed in /etc/ttys depending on the board.
+ * The default speed is 115200, which is patched when needed.
*/
- if (get_kernel_set() == SET_KERNEL_2)
- run_program(RUN_CHROOT,
- sed -an -e 's/115200/57600/;H;$!d;g;w /etc/ttys'
- /etc/ttys);
+ if (strcmp(prodname, kurobox) == 0)
+ new_speed = 57600; /* KuroBox */
+
+ else if (strcmp(prodname, dlink) == 0 || /* D-Link DSM-G600 */
+ strcmp(prodname, nhnas) == 0) /* NH23x, All6250 */
+ new_speed = 9600;
+
+ else
+ new_speed = 0;
+
+ if (new_speed != 0) {
+ snprintf(sed_cmd, 64, sed -an -e 's/115200/%d/;H;$!d;g;w
+ /etc/ttys' /etc/ttys, new_speed);
+ run_program(RUN_CHROOT, sed_cmd);
+ }
#endif
}
CVS commit: src/distrib/utils/sysinst/arch/hpcarm
Module Name:src
Committed By: tsutsui
Date: Sat Sep 4 01:23:25 UTC 2010
Modified Files:
src/distrib/utils/sysinst/arch/hpcarm: md.c md.h
Log Message:
Add dumb code to select an appropriate kernel set to be installed
per running INSTALL kernel name taken from sysctl kern.version.
XXX: on all arm ports, sysctl hw.cpu_model returns a processor name,
XXX: not machine model as mentioned in sys/sysctl.h.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/hpcarm/md.c
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/hpcarm/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/hpcarm/md.c
diff -u src/distrib/utils/sysinst/arch/hpcarm/md.c:1.7 src/distrib/utils/sysinst/arch/hpcarm/md.c:1.8
--- src/distrib/utils/sysinst/arch/hpcarm/md.c:1.7 Sat Sep 19 14:57:28 2009
+++ src/distrib/utils/sysinst/arch/hpcarm/md.c Sat Sep 4 01:23:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2009/09/19 14:57:28 abs Exp $ */
+/* $NetBSD: md.c,v 1.8 2010/09/04 01:23:25 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -59,7 +59,33 @@
void
md_init_set_status(int minimal)
{
- (void)minimal;
+ static const struct {
+ const char *name;
+ const int set;
+ } kern_sets[] = {
+ { IPAQ, SET_KERNEL_IPAQ },
+ { JORNADA720, SET_KERNEL_JORNADA720 },
+ { WZERO3, SET_KERNEL_WZERO3 }
+ };
+ static const int mib[2] = {CTL_KERN, KERN_VERSION};
+ size_t len;
+ char *version;
+ u_int i;
+
+ /* check INSTALL kernel name to select an appropriate kernel set */
+ /* XXX: hw.cpu_model has a processor name on arm ports */
+ sysctl(mib, 2, NULL, len, NULL, 0);
+ version = malloc(len);
+ if (version == NULL)
+ return;
+ sysctl(mib, 2, version, len, NULL, 0);
+ for (i = 0; i __arraycount(kern_sets); i++) {
+ if (strstr(version, kern_sets[i].name) != NULL) {
+ set_kernel_set(kern_sets[i].set);
+ break;
+ }
+ }
+ free(version);
}
int
Index: src/distrib/utils/sysinst/arch/hpcarm/md.h
diff -u src/distrib/utils/sysinst/arch/hpcarm/md.h:1.5 src/distrib/utils/sysinst/arch/hpcarm/md.h:1.6
--- src/distrib/utils/sysinst/arch/hpcarm/md.h:1.5 Mon May 10 16:33:45 2010
+++ src/distrib/utils/sysinst/arch/hpcarm/md.h Sat Sep 4 01:23:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.5 2010/05/10 16:33:45 tsutsui Exp $ */
+/* $NetBSD: md.h,v 1.6 2010/09/04 01:23:25 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -63,6 +63,10 @@
#define SET_KERNEL_2_NAME kern-JORNADA720
#define SET_KERNEL_3_NAME kern-WZERO3
+#define SET_KERNEL_IPAQ SET_KERNEL_1
+#define SET_KERNEL_JORNADA720 SET_KERNEL_2
+#define SET_KERNEL_WZERO3 SET_KERNEL_3
+
/*
* Machine-specific command to write a new label to a disk.
CVS commit: src/distrib/utils/sysinst/arch/sparc64
Module Name:src Committed By: martin Date: Fri Jun 25 10:21:50 UTC 2010 Modified Files: src/distrib/utils/sysinst/arch/sparc64: md.h Log Message: Re-enable LFS as /, now that booting from it works with the sysinst default FS parameters. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/sysinst/arch/sparc64/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/sparc64/md.h diff -u src/distrib/utils/sysinst/arch/sparc64/md.h:1.18 src/distrib/utils/sysinst/arch/sparc64/md.h:1.19 --- src/distrib/utils/sysinst/arch/sparc64/md.h:1.18 Mon Apr 5 22:53:02 2010 +++ src/distrib/utils/sysinst/arch/sparc64/md.h Fri Jun 25 10:21:50 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.18 2010/04/05 22:53:02 martin Exp $ */ +/* $NetBSD: md.h,v 1.19 2010/06/25 10:21:50 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -66,9 +66,6 @@ /* allow using tmpfs for /tmp instead of mfs */ #define HAVE_TMPFS -/* disable LFS support, despite providing the lfs utilities */ -#define NO_LFS - /* * Default filesets to fetch and install during installation * or upgrade.
CVS commit: src/distrib/utils/sysinst/arch/sandpoint
Module Name:src
Committed By: phx
Date: Sun Jun 13 15:32:00 UTC 2010
Modified Files:
src/distrib/utils/sysinst/arch/sandpoint: md.c
Log Message:
Automatically adjust the console speed to 57600 in /etc/ttys for KUROBOX
kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/utils/sysinst/arch/sandpoint/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/sandpoint/md.c
diff -u src/distrib/utils/sysinst/arch/sandpoint/md.c:1.31 src/distrib/utils/sysinst/arch/sandpoint/md.c:1.32
--- src/distrib/utils/sysinst/arch/sandpoint/md.c:1.31 Wed Jun 9 17:37:24 2010
+++ src/distrib/utils/sysinst/arch/sandpoint/md.c Sun Jun 13 15:32:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.31 2010/06/09 17:37:24 phx Exp $ */
+/* $NetBSD: md.c,v 1.32 2010/06/13 15:32:00 phx Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -160,6 +160,14 @@
{
#ifndef DEBUG
enable_rc_conf();
+
+ /*
+ * For KUROBOX set the console speed to 57600 in /etc/ttys.
+ */
+ if (get_kernel_set() == SET_KERNEL_2)
+ run_program(RUN_CHROOT,
+ sed -an -e 's/115200/57600/;H;$!d;g;w /etc/ttys'
+ /etc/ttys);
#endif
}
CVS commit: src/distrib/utils/sysinst/arch/sparc64
Module Name:src
Committed By: tsutsui
Date: Tue May 11 09:46:46 UTC 2010
Modified Files:
src/distrib/utils/sysinst/arch/sparc64: msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl
Log Message:
Sync with md.h rev 1.17:
convert sparc64 to MULTIPROCESSOR kernel by default, and introduce
s/MP/UP/ kernels were otherwise in place.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/sparc64/msg.md.de \
src/distrib/utils/sysinst/arch/sparc64/msg.md.es
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/sparc64/msg.md.en
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/sparc64/msg.md.fr
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/sparc64/msg.md.pl
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/sparc64/msg.md.de
diff -u src/distrib/utils/sysinst/arch/sparc64/msg.md.de:1.5 src/distrib/utils/sysinst/arch/sparc64/msg.md.de:1.6
--- src/distrib/utils/sysinst/arch/sparc64/msg.md.de:1.5 Sat Mar 15 18:30:13 2008
+++ src/distrib/utils/sysinst/arch/sparc64/msg.md.de Tue May 11 09:46:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.5 2008/03/15 18:30:13 martin Exp $ */
+/* $NetBSD: msg.md.de,v 1.6 2010/05/11 09:46:46 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -53,5 +53,5 @@
message set_kernel_1
{Kernel (GENERIC)}
message set_kernel_2
-{Kernel (GENERIC.MP)}
+{Kernel (GENERIC.UP)}
Index: src/distrib/utils/sysinst/arch/sparc64/msg.md.es
diff -u src/distrib/utils/sysinst/arch/sparc64/msg.md.es:1.5 src/distrib/utils/sysinst/arch/sparc64/msg.md.es:1.6
--- src/distrib/utils/sysinst/arch/sparc64/msg.md.es:1.5 Sat Mar 15 18:30:13 2008
+++ src/distrib/utils/sysinst/arch/sparc64/msg.md.es Tue May 11 09:46:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.5 2008/03/15 18:30:13 martin Exp $ */
+/* $NetBSD: msg.md.es,v 1.6 2010/05/11 09:46:46 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -52,5 +52,5 @@
message set_kernel_1
{Núcleo (GENERIC)}
message set_kernel_2
-{Núcleo (GENERIC.MP)}
+{Núcleo (GENERIC.UP)}
Index: src/distrib/utils/sysinst/arch/sparc64/msg.md.en
diff -u src/distrib/utils/sysinst/arch/sparc64/msg.md.en:1.7 src/distrib/utils/sysinst/arch/sparc64/msg.md.en:1.8
--- src/distrib/utils/sysinst/arch/sparc64/msg.md.en:1.7 Sat Mar 15 18:30:13 2008
+++ src/distrib/utils/sysinst/arch/sparc64/msg.md.en Tue May 11 09:46:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.7 2008/03/15 18:30:13 martin Exp $ */
+/* $NetBSD: msg.md.en,v 1.8 2010/05/11 09:46:46 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -52,4 +52,4 @@
message set_kernel_1
{Kernel (GENERIC)}
message set_kernel_2
-{Kernel (GENERIC.MP)}
+{Kernel (GENERIC.UP)}
Index: src/distrib/utils/sysinst/arch/sparc64/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/sparc64/msg.md.fr:1.8 src/distrib/utils/sysinst/arch/sparc64/msg.md.fr:1.9
--- src/distrib/utils/sysinst/arch/sparc64/msg.md.fr:1.8 Sat Oct 24 12:47:31 2009
+++ src/distrib/utils/sysinst/arch/sparc64/msg.md.fr Tue May 11 09:46:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.8 2009/10/24 12:47:31 stacktic Exp $ */
+/* $NetBSD: msg.md.fr,v 1.9 2010/05/11 09:46:46 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -52,4 +52,4 @@
message set_kernel_1
{Kernel (GENERIC)}
message set_kernel_2
-{Kernel (GENERIC.MP)}
+{Kernel (GENERIC.UP)}
Index: src/distrib/utils/sysinst/arch/sparc64/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/sparc64/msg.md.pl:1.6 src/distrib/utils/sysinst/arch/sparc64/msg.md.pl:1.7
--- src/distrib/utils/sysinst/arch/sparc64/msg.md.pl:1.6 Sat Mar 15 18:30:13 2008
+++ src/distrib/utils/sysinst/arch/sparc64/msg.md.pl Tue May 11 09:46:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.6 2008/03/15 18:30:13 martin Exp $ */
+/* $NetBSD: msg.md.pl,v 1.7 2010/05/11 09:46:46 tsutsui Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.2 2002/12/03 01:54:49 minoura Exp */
@@ -54,4 +54,4 @@
message set_kernel_1
{Kernel (GENERIC)}
message set_kernel_2
-{Kernel (GENERIC.MP)}
+{Kernel (GENERIC.UP)}
CVS commit: src/distrib/utils/sysinst/arch/hpcarm
Module Name:src
Committed By: tsutsui
Date: Sun May 2 13:52:01 UTC 2010
Modified Files:
src/distrib/utils/sysinst/arch/hpcarm: msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl
Log Message:
hpcarm doesn't have GENERIC or TX3912.
Use IPAQ and JORNADA720 instead in messages per md.h.
XXX1: hpcarm seems to have more kernels.
XXX2: hpcarm doesn't have a common INSTALL kernel so
choosing a kernel set during sysinst doesn't make sense.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/hpcarm/msg.md.de \
src/distrib/utils/sysinst/arch/hpcarm/msg.md.pl
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/hpcarm/msg.md.en \
src/distrib/utils/sysinst/arch/hpcarm/msg.md.es
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr
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/hpcarm/msg.md.de
diff -u src/distrib/utils/sysinst/arch/hpcarm/msg.md.de:1.1 src/distrib/utils/sysinst/arch/hpcarm/msg.md.de:1.2
--- src/distrib/utils/sysinst/arch/hpcarm/msg.md.de:1.1 Fri Dec 30 11:40:23 2005
+++ src/distrib/utils/sysinst/arch/hpcarm/msg.md.de Sun May 2 13:52:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.1 2005/12/30 11:40:23 rjs Exp $ */
+/* $NetBSD: msg.md.de,v 1.2 2010/05/02 13:52:00 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -102,7 +102,7 @@
message set_kernel_1
-{Kernel (GENERIC)}
+{Kernel (IPAQ)}
message set_kernel_2
-{Kernel (TX3912)}
+{Kernel (JORNADA720)}
Index: src/distrib/utils/sysinst/arch/hpcarm/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/hpcarm/msg.md.pl:1.1 src/distrib/utils/sysinst/arch/hpcarm/msg.md.pl:1.2
--- src/distrib/utils/sysinst/arch/hpcarm/msg.md.pl:1.1 Fri Dec 30 11:40:23 2005
+++ src/distrib/utils/sysinst/arch/hpcarm/msg.md.pl Sun May 2 13:52:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.1 2005/12/30 11:40:23 rjs Exp $ */
+/* $NetBSD: msg.md.pl,v 1.2 2010/05/02 13:52:00 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -92,6 +92,6 @@
(Odpowiedz 'nie' zabierze cie spowrotem do menu edycji partycji.)}
message set_kernel_1
-{Kernel (GENERIC)}
+{Kernel (IPAQ)}
message set_kernel_2
-{Kernel (TX3912)}
+{Kernel (JORNADA720)}
Index: src/distrib/utils/sysinst/arch/hpcarm/msg.md.en
diff -u src/distrib/utils/sysinst/arch/hpcarm/msg.md.en:1.2 src/distrib/utils/sysinst/arch/hpcarm/msg.md.en:1.3
--- src/distrib/utils/sysinst/arch/hpcarm/msg.md.en:1.2 Sat Feb 2 05:34:00 2008
+++ src/distrib/utils/sysinst/arch/hpcarm/msg.md.en Sun May 2 13:52:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.2 2008/02/02 05:34:00 itohy Exp $ */
+/* $NetBSD: msg.md.en,v 1.3 2010/05/02 13:52:00 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -96,7 +96,7 @@
(Answering 'no' will take you back to the partition edit menu.)}
message set_kernel_1
-{Kernel (GENERIC)}
+{Kernel (IPAQ)}
message set_kernel_2
-{Kernel (TX3912)}
+{Kernel (JORNADA720)}
Index: src/distrib/utils/sysinst/arch/hpcarm/msg.md.es
diff -u src/distrib/utils/sysinst/arch/hpcarm/msg.md.es:1.2 src/distrib/utils/sysinst/arch/hpcarm/msg.md.es:1.3
--- src/distrib/utils/sysinst/arch/hpcarm/msg.md.es:1.2 Sat Feb 2 05:34:00 2008
+++ src/distrib/utils/sysinst/arch/hpcarm/msg.md.es Sun May 2 13:52:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.2 2008/02/02 05:34:00 itohy Exp $ */
+/* $NetBSD: msg.md.es,v 1.3 2010/05/02 13:52:00 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -96,7 +96,7 @@
(Si contesta 'no' sera devuelto al menú de edicion de particiones.)}
message set_kernel_1
-{Núcleo (GENERIC)}
+{Núcleo (IPAQ)}
message set_kernel_2
-{Núcleo (TX3912)}
+{Núcleo (JORNADA720)}
Index: src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr:1.3 src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr:1.4
--- src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr:1.3 Sat Oct 24 12:47:30 2009
+++ src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr Sun May 2 13:52:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.3 2009/10/24 12:47:30 stacktic Exp $ */
+/* $NetBSD: msg.md.fr,v 1.4 2010/05/02 13:52:00 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -96,6 +96,6 @@
('Non' vous ramènera au menu d'édition des partitions.)}
message set_kernel_1
-{Kernel (GENERIC)}
+{Kernel (IPAQ)}
message set_kernel_2
-{Kernel (TX3912)}
+{Kernel (JORNADA720)}
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: tsutsui
Date: Sun May 2 14:00:44 UTC 2010
Modified Files:
src/distrib/utils/sysinst/arch/hpcarm: msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl
src/distrib/utils/sysinst/arch/hpcmips: msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl
Log Message:
Remove unused messages. (mostly pulled from i386?)
XXX1: I don't think it's worth to keep bad144 for modern flash devices.
XXX2: Should we still maintain non-English translations without a maintainer
even after we removed www translations?
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/hpcarm/msg.md.de \
src/distrib/utils/sysinst/arch/hpcarm/msg.md.pl
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/hpcarm/msg.md.en \
src/distrib/utils/sysinst/arch/hpcarm/msg.md.es
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/hpcmips/msg.md.de \
src/distrib/utils/sysinst/arch/hpcmips/msg.md.es
cvs rdiff -u -r1.15 -r1.16 src/distrib/utils/sysinst/arch/hpcmips/msg.md.en
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/sysinst/arch/hpcmips/msg.md.fr
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/hpcmips/msg.md.pl
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/hpcarm/msg.md.de
diff -u src/distrib/utils/sysinst/arch/hpcarm/msg.md.de:1.2 src/distrib/utils/sysinst/arch/hpcarm/msg.md.de:1.3
--- src/distrib/utils/sysinst/arch/hpcarm/msg.md.de:1.2 Sun May 2 13:52:00 2010
+++ src/distrib/utils/sysinst/arch/hpcarm/msg.md.de Sun May 2 14:00:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.2 2010/05/02 13:52:00 tsutsui Exp $ */
+/* $NetBSD: msg.md.de,v 1.3 2010/05/02 14:00:44 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -48,59 +48,6 @@
{Installiere die Tabelle der defekten Blöcke ...
}
-message getboottype
-{Möchten Sie normale oder serielle Bootblöcke installieren?
-
-Normale Bootblöcke benutzen die BIOS Konsolenschnittstelle als die Konsole
-(meistens der Montior und die Tastatur). Serielle Bootblöcke benutzen den
-ersten seriellen Anschluss als Konsole.
-}
-
-message dobootblks
-{Installiere die Bootblöcke auf %s ...
-}
-
-message onebiosmatch
-{Diese Festplatte entspricht der folgenden BIOS Disk:
-
-}
-
-message onebiosmatch_header
-{BIOS # Zylinder Köpfe Sektoren
--- -- ---
-}
-
-message onebiosmatch_row
-{%-6x %-10d %-7d %d\n}
-
-message biosmultmatch
-{Diese Festplatte entspricht der folgenden BIOS Disk:
-
-}
-
-message biosmultmatch_header
-{ BIOS # Zylinder Köpfe Sektoren
- -- -- ---
-}
-
-message biosmultmatch_row
-{%-1d: %-6x %-10d %-7d %d\n}
-
-message pickdisk
-{Wählen Sie eine Festplatte: }
-
-
-message partabovechs
-{Der NetBSD Teil der Festplatte liegt außerhalb des vom BIOS dieser
-Maschine adressierbaren Bereichs. Eventuell ist es nicht möglich, von
-dieser Partition zu booten. Sind Sie sicher, daß Sie fortfahren möchten?
-
-(Antworten Sie mit 'nein' werden Sie zum Menü der Partitioneneditierung
-zurückbefördert.)}
-
-
-
-
message set_kernel_1
{Kernel (IPAQ)}
message set_kernel_2
Index: src/distrib/utils/sysinst/arch/hpcarm/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/hpcarm/msg.md.pl:1.2 src/distrib/utils/sysinst/arch/hpcarm/msg.md.pl:1.3
--- src/distrib/utils/sysinst/arch/hpcarm/msg.md.pl:1.2 Sun May 2 13:52:00 2010
+++ src/distrib/utils/sysinst/arch/hpcarm/msg.md.pl Sun May 2 14:00:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.2 2010/05/02 13:52:00 tsutsui Exp $ */
+/* $NetBSD: msg.md.pl,v 1.3 2010/05/02 14:00:44 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -47,50 +47,6 @@
{Instalowanie tablicy zlych blokow ...
}
-message getboottype
-{Czy chcesz zainstalowac normalne bootbloki, czy te do uzycia z zewn. konsola?
-}
-
-message dobootblks
-{Instalowanie bootblokow na %s
-}
-
-message onebiosmatch
-{Ten dysk odpowiada ponizszemu dyskowi BIOS:
-
-}
-
-message onebiosmatch_header
-{BIOS # cylindry glowice sektory
--- -- --- ---
-}
-
-message onebiosmatch_row
-{%-6x %-10d %-7d %d\n}
-
-message biosmultmatch
-{Ten dysk odpowiada ponizszym dyskom BIOS:
-
-}
-
-message biosmultmatch_header
-{ BIOS # cylindry glowice sektory
- -- -- --- ---
-}
-
-message biosmultmatch_row
-{%-1d: %-6x %-10d %-7d %d\n}
-
-message pickdisk
-{Wybierz dysk: }
-
-message partabovechs
-{Czesc NetBSD dysku lezy poza obszarem, ktory BIOS w twojej maszynie moze
-zaadresowac. Nie mozliwe bedzie bootowanie z tego dysku. Jestes pewien, ze
-chcesz to zrobic?
-
-(Odpowiedz 'nie' zabierze cie spowrotem do menu edycji partycji.)}
-
message set_kernel_1
{Kernel (IPAQ)}
message set_kernel_2
Index:
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: tsutsui
Date: Sun May 2 16:35:09 UTC 2010
Modified Files:
src/distrib/utils/sysinst/arch/hpcarm: msg.md.en
src/distrib/utils/sysinst/arch/hpcmips: msg.md.en
Log Message:
There is no bootable floppy on hpc ports.
XXX: no translations
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/hpcarm/msg.md.en
cvs rdiff -u -r1.16 -r1.17 src/distrib/utils/sysinst/arch/hpcmips/msg.md.en
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/hpcarm/msg.md.en
diff -u src/distrib/utils/sysinst/arch/hpcarm/msg.md.en:1.4 src/distrib/utils/sysinst/arch/hpcarm/msg.md.en:1.5
--- src/distrib/utils/sysinst/arch/hpcarm/msg.md.en:1.4 Sun May 2 14:00:44 2010
+++ src/distrib/utils/sysinst/arch/hpcarm/msg.md.en Sun May 2 16:35:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.4 2010/05/02 14:00:44 tsutsui Exp $ */
+/* $NetBSD: msg.md.en,v 1.5 2010/05/02 16:35:09 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -39,7 +39,7 @@
/* MD Message catalog -- English, hpcarm version */
message md_hello
-{If you booted from a floppy, you may now remove the disk.
+{If you booted from an external device, you may now remove it.
}
Index: src/distrib/utils/sysinst/arch/hpcmips/msg.md.en
diff -u src/distrib/utils/sysinst/arch/hpcmips/msg.md.en:1.16 src/distrib/utils/sysinst/arch/hpcmips/msg.md.en:1.17
--- src/distrib/utils/sysinst/arch/hpcmips/msg.md.en:1.16 Sun May 2 14:00:44 2010
+++ src/distrib/utils/sysinst/arch/hpcmips/msg.md.en Sun May 2 16:35:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.16 2010/05/02 14:00:44 tsutsui Exp $ */
+/* $NetBSD: msg.md.en,v 1.17 2010/05/02 16:35:09 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -39,7 +39,7 @@
/* MD Message catalog -- English, hpcmips version */
message md_hello
-{If you booted from a floppy, you may now remove the disk.
+{If you booted from an external device, you may now remove it.
}
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/hpcmips
Module Name:src Committed By: tsutsui Date: Sat May 1 11:14:37 UTC 2010 Modified Files: src/distrib/utils/sysinst/arch/hpcmips: md.h Log Message: Fix pasto in comment. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/distrib/utils/sysinst/arch/hpcmips/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/hpcmips/md.h diff -u src/distrib/utils/sysinst/arch/hpcmips/md.h:1.26 src/distrib/utils/sysinst/arch/hpcmips/md.h:1.27 --- src/distrib/utils/sysinst/arch/hpcmips/md.h:1.26 Mon Nov 12 15:07:35 2007 +++ src/distrib/utils/sysinst/arch/hpcmips/md.h Sat May 1 11:14:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.26 2007/11/12 15:07:35 jmmv Exp $ */ +/* $NetBSD: md.h,v 1.27 2010/05/01 11:14:37 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -36,7 +36,7 @@ * */ -/* md.h -- Machine specific definitions for the i386 */ +/* md.h -- Machine specific definitions for the hpcmips */ #include machine/cpu.h @@ -71,7 +71,5 @@ * to get incore to ondisk inode translation for the Sun proms. * If not defined, we assume the port does not support disklabels and * hand-edited disklabel will NOT be written by MI code. - * - * On i386, do what the 1.2 install scripts did. */ #define DISKLABEL_CMD disklabel -w -r
CVS commit: src/distrib/utils/sysinst/arch/i386
Module Name:src
Committed By: martin
Date: Mon Apr 19 20:35:24 UTC 2010
Modified Files:
src/distrib/utils/sysinst/arch/i386: md.c
Log Message:
Do not ask for a bios geometry if we can not match the device to a bios
known device - it's most certainly a don't care.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/distrib/utils/sysinst/arch/i386/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/i386/md.c
diff -u src/distrib/utils/sysinst/arch/i386/md.c:1.124 src/distrib/utils/sysinst/arch/i386/md.c:1.125
--- src/distrib/utils/sysinst/arch/i386/md.c:1.124 Sat Jan 2 18:06:58 2010
+++ src/distrib/utils/sysinst/arch/i386/md.c Mon Apr 19 20:35:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.124 2010/01/02 18:06:58 dsl Exp $ */
+/* $NetBSD: md.c,v 1.125 2010/04/19 20:35:23 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -471,8 +471,10 @@
}
if (nip == NULL || nip-ni_nmatches == 0) {
nogeom:
- msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
- if (guess_biosgeom_from_mbr(mbr, cyl, head, sec) = 0)
+ if (nip != NULL)
+ msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
+ if (guess_biosgeom_from_mbr(mbr, cyl, head, sec) = 0
+ nip != NULL)
msg_display_add(MSG_biosguess, cyl, head, sec);
biosdisk = NULL;
} else {
@@ -507,9 +509,10 @@
nip-ni_biosmatches[i]];
}
}
- if (biosdisk == NULL)
- set_bios_geom(cyl, head, sec);
- else {
+ if (biosdisk == NULL) {
+ if (nip != NULL)
+ set_bios_geom(cyl, head, sec);
+ } else {
bcyl = biosdisk-bi_cyl;
bhead = biosdisk-bi_head;
bsec = biosdisk-bi_sec;
CVS commit: src/distrib/utils/sysinst/arch/cobalt
Module Name:src
Committed By: wiz
Date: Sun Feb 21 13:28:47 UTC 2010
Modified Files:
src/distrib/utils/sysinst/arch/cobalt: msg.md.en
Log Message:
Consistently call the file system ext2.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/cobalt/msg.md.en
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/cobalt/msg.md.en
diff -u src/distrib/utils/sysinst/arch/cobalt/msg.md.en:1.2 src/distrib/utils/sysinst/arch/cobalt/msg.md.en:1.3
--- src/distrib/utils/sysinst/arch/cobalt/msg.md.en:1.2 Fri Mar 6 19:05:02 2009
+++ src/distrib/utils/sysinst/arch/cobalt/msg.md.en Sun Feb 21 13:28:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.2 2009/03/06 19:05:02 reed Exp $ */
+/* $NetBSD: msg.md.en,v 1.3 2010/02/21 13:28:46 wiz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -61,10 +61,10 @@
(Answering 'no' will take you back to the partition edit menu.)}
message nobootpart
-{There is no Linux Ext2 partition in the MBR partition table.}
+{There is no Linux ext2 partition in the MBR partition table.}
message boottoosmall
-{The Linux Ext2 partition to install the native bootloader is too small.
+{The Linux ext2 partition to install the native bootloader is too small.
It needs to be at least 1MB in size, however a size of at least 5MB is
recommended.}
@@ -73,7 +73,7 @@
match the boot partition you set up in the MBR partition table.}
message copybootloader
-{Installing bootloader into the Linux Ext2 partition on %s...
+{Installing bootloader into the Linux ext2 partition on %s...
}
message set_kernel_1
CVS commit: src/distrib/utils/sysinst/arch/sparc64
Module Name:src Committed By: martin Date: Wed Feb 17 16:11:01 UTC 2010 Modified Files: src/distrib/utils/sysinst/arch/sparc64: md.h Log Message: We can now boot from FFSv2, so offer it + even use it as a default. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/sysinst/arch/sparc64/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/sparc64/md.h diff -u src/distrib/utils/sysinst/arch/sparc64/md.h:1.14 src/distrib/utils/sysinst/arch/sparc64/md.h:1.15 --- src/distrib/utils/sysinst/arch/sparc64/md.h:1.14 Sat Mar 15 18:30:13 2008 +++ src/distrib/utils/sysinst/arch/sparc64/md.h Wed Feb 17 16:11:00 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.14 2008/03/15 18:30:13 martin Exp $ */ +/* $NetBSD: md.h,v 1.15 2010/02/17 16:11:00 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -56,6 +56,15 @@ #define DEFUSRSIZE 240 /* Default /usr size, if /home */ #define XNEEDMB 80 /* Extra megs for full X installation */ +/* use UFS2 by default for ffs */ +#define DEFAULT_UFS2 + +/* have support for booting from UFS2 */ +#define HAVE_UFS2_BOOT + +/* allow using tmpfs for /tmp instead of mfs */ +#define HAVE_TMPFS + /* * Default filesets to fetch and install during installation * or upgrade.
CVS commit: src/distrib/utils/sysinst/arch/mac68k
Module Name:src Committed By: wiz Date: Sun Jan 17 22:47:19 UTC 2010 Modified Files: src/distrib/utils/sysinst/arch/mac68k: md.c Log Message: Close file when finished with it. Found by cppcheck. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/distrib/utils/sysinst/arch/mac68k/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/mac68k/md.c diff -u src/distrib/utils/sysinst/arch/mac68k/md.c:1.56 src/distrib/utils/sysinst/arch/mac68k/md.c:1.57 --- src/distrib/utils/sysinst/arch/mac68k/md.c:1.56 Sat Jan 2 18:06:58 2010 +++ src/distrib/utils/sysinst/arch/mac68k/md.c Sun Jan 17 22:47:18 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.56 2010/01/02 18:06:58 dsl Exp $ */ +/* $NetBSD: md.c,v 1.57 2010/01/17 22:47:18 wiz Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -777,6 +777,7 @@ strncat(name, (, len_name-strlen(name)); strncat(name, macosblk[37], len_name-strlen(name)); strncat(name, ), len_name-strlen(name)); + close(fd); } break; default:
CVS commit: src/distrib/utils/sysinst/arch/mac68k
Module Name:src
Committed By: dsl
Date: Sat Jan 2 17:15:07 UTC 2010
Modified Files:
src/distrib/utils/sysinst/arch/mac68k: menus.md.de menus.md.en
menus.md.es menus.md.pl
Log Message:
Sanitise whitespace to minimise the differences between these files.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/mac68k/menus.md.de
cvs rdiff -u -r1.21 -r1.22 src/distrib/utils/sysinst/arch/mac68k/menus.md.en
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/mac68k/menus.md.es
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/mac68k/menus.md.pl
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/mac68k/menus.md.de
diff -u src/distrib/utils/sysinst/arch/mac68k/menus.md.de:1.3 src/distrib/utils/sysinst/arch/mac68k/menus.md.de:1.4
--- src/distrib/utils/sysinst/arch/mac68k/menus.md.de:1.3 Sat May 24 21:42:52 2008
+++ src/distrib/utils/sysinst/arch/mac68k/menus.md.de Sat Jan 2 17:15:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.de,v 1.3 2008/05/24 21:42:52 hauke Exp $ */
+/* $NetBSD: menus.md.de,v 1.4 2010/01/02 17:15:07 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -57,21 +57,21 @@
endwin();
return 0;
}
- map.size = NEW_MAP_SIZE;
+ map.size = NEW_MAP_SIZE;
map.in_use_cnt = new_map[0].pmMapBlkCnt;
map.blk = (struct apple_part_map_entry *)calloc(map.size,
sizeof(struct apple_part_map_entry));
for (i=0;imap.size;i++)
memcpy (map.blk[i], new_map[i],
sizeof(struct apple_part_map_entry));
- };
+ };
menu editparttable, title Wählen Sie eine Partition, exit, y=14;
display action { msg_display (MSG_editparttable);
sortmerge();
if (map.selected = map.usable_cnt)
map.selected = 0;
- disp_selected_part (map.selected);
+ disp_selected_part (map.selected);
};
option Nächste Partition auswählen, action {
map.selected += 1;
@@ -104,7 +104,7 @@
strcpy (map.blk[k].pmPartType, Apple_Free);
map.blk[k].pmPyPartStart += size;
if ((map.blk[k].pmPyPartStart + free_size) dlsize)
- map.blk[k].pmPartBlkCnt =
+ map.blk[k].pmPartBlkCnt =
dlsize - map.blk[k].pmPyPartStart;
else
map.blk[k].pmPartBlkCnt = free_size;
@@ -117,39 +117,39 @@
} else {
msg_display (MSG_diskfull);
process_menu (MENU_okabort, NULL);
- if (!yesno) {
+ if (!yesno) {
free (map.blk);
- map.size = NEW_MAP_SIZE;
+ map.size = NEW_MAP_SIZE;
map.in_use_cnt = new_map[0].pmMapBlkCnt;
map.blk = (struct apple_part_map_entry *)calloc(map.size,
sizeof(struct apple_part_map_entry));
for (i=0;imap.size;i++)
- memcpy (map.blk[i], new_map[i],
- sizeof(struct apple_part_map_entry));
+memcpy (map.blk[i], new_map[i],
+sizeof(struct apple_part_map_entry));
map.blk[0].pmSigPad = 0; /* Don't rewrite Block0 */
}
}
} };
-option Partition korrigieren, action {
-int i = map.mblk[map.selected];
-EBZB *bzb = (EBZB *)map.blk[i].pmBootArgs[0];
-msg_display(MSG_partdebug, diskdev, bzb-flags.part,
-map.blk[i].pmPyPartStart,
-map.blk[i].pmPartBlkCnt);
-if ((map.blk[i].pmPyPartStart +
-map.blk[i].pmPartBlkCnt) dlsize) {
+ option Partition korrigieren, action {
+ int i = map.mblk[map.selected];
+ EBZB *bzb = (EBZB *)map.blk[i].pmBootArgs[0];
+ msg_display(MSG_partdebug, diskdev, bzb-flags.part,
+ map.blk[i].pmPyPartStart,
+ map.blk[i].pmPartBlkCnt);
+ if ((map.blk[i].pmPyPartStart +
+ map.blk[i].pmPartBlkCnt) dlsize) {
msg_display_add(MSG_parttable_fix_fixing,
-diskdev, bzb-flags.part);
-map.blk[i].pmPartBlkCnt =
-dlsize - map.blk[i].pmPyPartStart;
-map.blk[i].pmDataCnt =
-map.blk[i].pmPartBlkCnt;
-} else {
+diskdev, bzb-flags.part);
+ map.blk[i].pmPartBlkCnt =
+ dlsize - map.blk[i].pmPyPartStart;
+ map.blk[i].pmDataCnt =
+ map.blk[i].pmPartBlkCnt;
+ } else {
msg_display_add(MSG_parttable_fix_fine,
-diskdev, bzb-flags.part);
-}
-process_menu(MENU_ok, NULL);
-};
+ diskdev, bzb-flags.part);
+ }
+ process_menu(MENU_ok, NULL);
+ };
menu ok2, title Abbrechen?, y=17;
@@ -184,7 +184,7 @@
if (whichType(map.blk[j]) == ROOT_PART) {
bzb = (EBZB *)map.blk[j].pmBootArgs[0];
if (bzb-type == APPLE_BZB_TYPEFS bzb-flags.root) {
- if (map.root_cnt++ == 0)
+ if (map.root_cnt++ == 0)
strcpy (bzb-mount_point, /);
else
strcpy (bzb-mount_point, /altroot);
@@ -233,8 +233,8 @@
if
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: dsl
Date: Sat Jan 2 20:54:46 UTC 2010
Modified Files:
src/distrib/utils/sysinst/arch/mvme68k: md.c
src/distrib/utils/sysinst/arch/x68k: md.c
Log Message:
Fix another couple of signed v unsigned comparisons of disk block numbers.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/utils/sysinst/arch/mvme68k/md.c
cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/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/distrib/utils/sysinst/arch/mvme68k/md.c
diff -u src/distrib/utils/sysinst/arch/mvme68k/md.c:1.22 src/distrib/utils/sysinst/arch/mvme68k/md.c:1.23
--- src/distrib/utils/sysinst/arch/mvme68k/md.c:1.22 Sat Sep 19 14:57:29 2009
+++ src/distrib/utils/sysinst/arch/mvme68k/md.c Sat Jan 2 20:54:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.22 2009/09/19 14:57:29 abs Exp $ */
+/* $NetBSD: md.c,v 1.23 2010/01/02 20:54:46 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -135,7 +135,8 @@
md_check_partitions(void)
{
/* mvme68k partitions must be in order of the range. */
- int part, start = 0, last = PART_A-1;
+ int part, last = PART_A-1;
+ uint32_t start = 0;
for (part = PART_A; part 8; part++) {
if (part == PART_C)
Index: src/distrib/utils/sysinst/arch/x68k/md.c
diff -u src/distrib/utils/sysinst/arch/x68k/md.c:1.37 src/distrib/utils/sysinst/arch/x68k/md.c:1.38
--- src/distrib/utils/sysinst/arch/x68k/md.c:1.37 Sat Sep 19 14:57:30 2009
+++ src/distrib/utils/sysinst/arch/x68k/md.c Sat Jan 2 20:54:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.37 2009/09/19 14:57:30 abs Exp $ */
+/* $NetBSD: md.c,v 1.38 2010/01/02 20:54:46 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -163,7 +163,8 @@
md_check_partitions(void)
{
/* X68k partitions must be in order of the range. */
- int part, start = 0, last = PART_A-1;
+ int part, last = PART_A-1;
+ uint32_t start = 0;
for (part = PART_A; part 8; part++) {
if (part == PART_C)
CVS commit: src/distrib/utils/sysinst/arch/macppc
Module Name:src
Committed By: tsutsui
Date: Mon Nov 23 13:25:02 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/macppc: md.c
Log Message:
Don't try installboot(8) if offset of PART_A is not zero.
As man page says, installboot(8) is required only OpenFirmware 1 and 2
machines and even on such machines the root partition has to be at the
beginning of the disk to make installboot(8) work.
On OpenFirmware version 3 machines, the strategy provided by
installboot(8) doesn't work, and they need to have an extra
native partition (HFS or FAT16) which can be recognized by
the newer firmware to put a loadable bootloader.
If PART_A has some offset, we can assume the disk is partitioned
for a machine with OF3, which does't require installboot(8).
Eventually, we should provide an independent partitioning method
for OpenFirmware 3 machines (fdisk MBR partition + FAT16 partition
for ofwboot.xcf as OpenBSD does), but it may require some new API
to get OF version in sysinst.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/utils/sysinst/arch/macppc/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/macppc/md.c
diff -u src/distrib/utils/sysinst/arch/macppc/md.c:1.41 src/distrib/utils/sysinst/arch/macppc/md.c:1.42
--- src/distrib/utils/sysinst/arch/macppc/md.c:1.41 Sat Sep 19 14:57:29 2009
+++ src/distrib/utils/sysinst/arch/macppc/md.c Mon Nov 23 13:25:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.41 2009/09/19 14:57:29 abs Exp $ */
+/* $NetBSD: md.c,v 1.42 2009/11/23 13:25:02 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -154,6 +154,31 @@
{
const char *bootfile = /boot;
+ /*
+ * XXX
+ * Only OpenFirmware version 1 and 2 machines need installboot(8)
+ * and it uses a faked Apple partition map with the primary bootxx.
+ * installboot(8) assumes that root partition is at the beginning of
+ * the disk and put a faked Apple partition map at the top of
+ * the partition, so it won't work if root partition has some
+ * offset from physical block 0 where the Apple driver descriptor
+ * map resides on.
+ *
+ * On OpenFirmware version 3 machines, the strategy used on OF1/2
+ * machines doesn't work (they don't recognize boot code info
+ * in Apple partition map entries) and they need to have
+ * an extra native partition (HFS or MSDOSFS) which can be
+ * recognized by the newer firmware to put a loadable bootloader.
+ * installboot(8) against partition `a' on such machines might
+ * corrupt existing disklabel or a valid Apple partition map.
+ *
+ * Currently there is no way to see OF version on running machine
+ * yet, so assume partition a has some offset on OF3 machines
+ * and don't try installboot(8) in that case.
+ */
+ if (bsdlabel[PART_A].pi_offset != 0)
+ return 0;
+
printf (msg_string(MSG_dobootblks), diskdev);
cp_to_target(/usr/mdec/ofwboot, bootfile);
sync();
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: stacktic
Date: Sat Oct 24 12:47:31 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/alpha: msg.md.fr
src/distrib/utils/sysinst/arch/amiga: msg.md.fr
src/distrib/utils/sysinst/arch/hpcarm: msg.md.fr
src/distrib/utils/sysinst/arch/i386: msg.md.fr
src/distrib/utils/sysinst/arch/macppc: msg.md.fr
src/distrib/utils/sysinst/arch/playstation2: msg.md.fr
src/distrib/utils/sysinst/arch/sparc: msg.md.fr
src/distrib/utils/sysinst/arch/sparc64: msg.md.fr
Log Message:
Fixed a few french messages - patch from Marylène Ysmal.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/alpha/msg.md.fr
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/amiga/msg.md.fr
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr
cvs rdiff -u -r1.48 -r1.49 src/distrib/utils/sysinst/arch/i386/msg.md.fr
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/macppc/msg.md.fr
cvs rdiff -u -r1.9 -r1.10 \
src/distrib/utils/sysinst/arch/playstation2/msg.md.fr
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/sparc/msg.md.fr
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/sparc64/msg.md.fr
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/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/alpha/msg.md.fr:1.10 src/distrib/utils/sysinst/arch/alpha/msg.md.fr:1.11
--- src/distrib/utils/sysinst/arch/alpha/msg.md.fr:1.10 Sat Feb 2 04:51:36 2008
+++ src/distrib/utils/sysinst/arch/alpha/msg.md.fr Sat Oct 24 12:47:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.10 2008/02/02 04:51:36 itohy Exp $ */
+/* $NetBSD: msg.md.fr,v 1.11 2009/10/24 12:47:30 stacktic Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -46,7 +46,7 @@
}
message dobootblks
-{Installation du block de démarrage sur %s ...
+{Installation des blocs de démarrage sur %s ...
}
message set_kernel_1
Index: src/distrib/utils/sysinst/arch/amiga/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/amiga/msg.md.fr:1.5 src/distrib/utils/sysinst/arch/amiga/msg.md.fr:1.6
--- src/distrib/utils/sysinst/arch/amiga/msg.md.fr:1.5 Sat Feb 2 05:33:56 2008
+++ src/distrib/utils/sysinst/arch/amiga/msg.md.fr Sat Oct 24 12:47:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.5 2008/02/02 05:33:56 itohy Exp $ */
+/* $NetBSD: msg.md.fr,v 1.6 2009/10/24 12:47:30 stacktic Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -44,7 +44,7 @@
}
message dobootblks
-{Installation des block de démarrage sur %s ...
+{Installation des blocs de démarrage sur %s ...
}
message set_kernel_1
Index: src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr:1.2 src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr:1.3
--- src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr:1.2 Sat Feb 2 05:34:00 2008
+++ src/distrib/utils/sysinst/arch/hpcarm/msg.md.fr Sat Oct 24 12:47:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.2 2008/02/02 05:34:00 itohy Exp $ */
+/* $NetBSD: msg.md.fr,v 1.3 2009/10/24 12:47:30 stacktic Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -44,52 +44,56 @@
}
message dobad144
-{Installation de la table des block défectueux ...
+{Installation de la table des blocs défectueux ...
}
message getboottype
-{Aimez-vous installer l'ensemble normal de bootblocks ou de bootblocks serial?
+{Voulez-vous installer le programme de démarrage standard ou sur port série ?
+
+Le programme de démarrage standard utilise les périphériques définis par le
+BIOS (en général le moniteur et le clavier). Le programme de démarrage sur
+port série utilise quant à lui le premier port série.
}
message dobootblks
-{Installation des block de démarrage sur %s ...
+{Installation des blocs de démarrage sur %s ...
}
message onebiosmatch
-{Ce disque correspond au disque du BIOS suivant:
+{Ce disque correspond au disque du BIOS suivant :
}
message onebiosmatch_header
-{BIOS # cylinders heads sectors
--- -- --- ---
+{BIOS # cylindres têtes secteurs
+-- -- ---
}
message onebiosmatch_row
{%-6x %-10d %-7d %-10d\n}
message biosmultmatch
-{Ce disque correspond aux disques du BIOS suivants:
+{Ce disque correspond aux disques du BIOS suivants :
}
message biosmultmatch_header
-{ BIOS # cylinders heads sectors
- -- -- --- ---
+{ BIOS # cylindres têtes secteurs
+ -- -- ---
}
message biosmultmatch_row
{%-1d: %-6x %-10d %-7d %d\n}
message pickdisk
-{Choisissez un disque: }
+{Choisissez un disque : }
message partabovechs
{La partition de votre disque réservée à NetBSD se trouve en-dehors de l'espace
-que le BIOS de votre machine peut adresser. L'amorcage depuis cette
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: stacktic
Date: Sat Oct 24 14:41:58 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/acorn26: msg.md.fr
src/distrib/utils/sysinst/arch/acorn32: msg.md.fr
src/distrib/utils/sysinst/arch/bebox: msg.md.fr
src/distrib/utils/sysinst/arch/cats: msg.md.fr
src/distrib/utils/sysinst/arch/evbarm: msg.md.fr
src/distrib/utils/sysinst/arch/evbmips: msg.md.fr
src/distrib/utils/sysinst/arch/evbppc: msg.md.fr
src/distrib/utils/sysinst/arch/hp300: msg.md.fr
src/distrib/utils/sysinst/arch/hp700: msg.md.fr
src/distrib/utils/sysinst/arch/hpcmips: msg.md.fr
src/distrib/utils/sysinst/arch/landisk: msg.md.fr
src/distrib/utils/sysinst/arch/mvme68k: msg.md.fr
src/distrib/utils/sysinst/arch/news68k: msg.md.fr
src/distrib/utils/sysinst/arch/newsmips: msg.md.fr
src/distrib/utils/sysinst/arch/sandpoint: msg.md.fr
src/distrib/utils/sysinst/arch/shark: msg.md.fr
src/distrib/utils/sysinst/arch/vax: msg.md.fr
src/distrib/utils/sysinst/arch/zaurus: msg.md.fr
Log Message:
Fixed a few french messages - patch from Marylène Ysmal.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/acorn26/msg.md.fr
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/acorn32/msg.md.fr
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/sysinst/arch/bebox/msg.md.fr
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/cats/msg.md.fr
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/evbarm/msg.md.fr
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/evbmips/msg.md.fr
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/evbppc/msg.md.fr
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/hp300/msg.md.fr
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/hp700/msg.md.fr
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/sysinst/arch/hpcmips/msg.md.fr
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/landisk/msg.md.fr
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/mvme68k/msg.md.fr
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/news68k/msg.md.fr
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/newsmips/msg.md.fr
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/sandpoint/msg.md.fr
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/shark/msg.md.fr
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/vax/msg.md.fr
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/zaurus/msg.md.fr
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/acorn26/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/acorn26/msg.md.fr:1.6 src/distrib/utils/sysinst/arch/acorn26/msg.md.fr:1.7
--- src/distrib/utils/sysinst/arch/acorn26/msg.md.fr:1.6 Sat Feb 2 04:51:34 2008
+++ src/distrib/utils/sysinst/arch/acorn26/msg.md.fr Sat Oct 24 14:41:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.6 2008/02/02 04:51:34 itohy Exp $ */
+/* $NetBSD: msg.md.fr,v 1.7 2009/10/24 14:41:57 stacktic Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,21 +50,21 @@
}
message badreadriscix
-{Impossible de lire la table de partition RISCiX
+{Impossible de lire la table de partitions RISCiX
}
message notnetbsdriscix
-{Aucune partition NetBSD trouvée dans la table de partition RISCiX. Impossible
-de crééer un label.
+{Aucune partition NetBSD trouvée dans la table de partitions RISCiX. Impossible
+de créer un label.
}
message notnetbsd
-{Aucune partition NetBSD trouvée (disque juste filecore ?). Impossible
-de crééer un label.
+{Aucune partition NetBSD trouvée (disque filecore uniquement ?). Impossible
+de créer un label.
}
message dobootblks
-{Installation du block de démarrage sur %s ...
+{Installation des blocs de démarrage sur %s ...
}
message set_kernel_1
Index: src/distrib/utils/sysinst/arch/acorn32/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/acorn32/msg.md.fr:1.9 src/distrib/utils/sysinst/arch/acorn32/msg.md.fr:1.10
--- src/distrib/utils/sysinst/arch/acorn32/msg.md.fr:1.9 Mon Feb 4 08:42:41 2008
+++ src/distrib/utils/sysinst/arch/acorn32/msg.md.fr Sat Oct 24 14:41:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.9 2008/02/04 08:42:41 chris Exp $ */
+/* $NetBSD: msg.md.fr,v 1.10 2009/10/24 14:41:57 stacktic Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,21 +50,21 @@
}
message badreadriscix
-{Impossible de lire la table de partition RISCiX
+{Impossible de lire la table de partitions RISCiX
}
message notnetbsdriscix
-{Aucune partition NetBSD trouvée dans la table de partition RISCiX. Impossible
-de crééer un label.
+{Aucune partition NetBSD trouvée dans la table de partitions RISCiX. Impossible
+de créer un label.
}
message notnetbsd
-{Aucune partition NetBSD trouvée (disque juste filecore ?). Impossible
CVS commit: src/distrib/utils/sysinst/arch/cobalt
Module Name:src Committed By: tsutsui Date: Sun Aug 23 13:36:54 UTC 2009 Modified Files: src/distrib/utils/sysinst/arch/cobalt: md.c Log Message: Remove existing gzipped bootloader before installing new one for upgrade install. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/cobalt/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/cobalt/md.c diff -u src/distrib/utils/sysinst/arch/cobalt/md.c:1.3 src/distrib/utils/sysinst/arch/cobalt/md.c:1.4 --- src/distrib/utils/sysinst/arch/cobalt/md.c:1.3 Sat May 16 10:40:16 2009 +++ src/distrib/utils/sysinst/arch/cobalt/md.c Sun Aug 23 13:36:54 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.3 2009/05/16 10:40:16 nonaka Exp $ */ +/* $NetBSD: md.c,v 1.4 2009/08/23 13:36:54 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -112,6 +112,7 @@ target_expand(PART_BOOT_EXT2FS_PI_MOUNT)); run_program(0, /bin/mkdir -p %s, bootdir); run_program(0, /bin/cp /usr/mdec/boot %s, bootdir); + run_program(0, /bin/rm -f %s/%s, bootdir, bootfile); run_program(0, /usr/bin/gzip -9 %s/boot, bootdir); for (i = 0; i __arraycount(kernels); i++) run_program(0, /bin/ln -fs %s %s/%s,
CVS commit: src/distrib/utils/sysinst/arch/i386
Module Name:src
Committed By: jmcneill
Date: Sun Aug 23 20:57:40 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/i386: msg.md.en
Log Message:
Mention USB media as well as floppy disks.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/distrib/utils/sysinst/arch/i386/msg.md.en
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/i386/msg.md.en
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.en:1.58 src/distrib/utils/sysinst/arch/i386/msg.md.en:1.59
--- src/distrib/utils/sysinst/arch/i386/msg.md.en:1.58 Tue Apr 7 10:45:05 2009
+++ src/distrib/utils/sysinst/arch/i386/msg.md.en Sun Aug 23 20:57:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.58 2009/04/07 10:45:05 tsutsui Exp $ */
+/* $NetBSD: msg.md.en,v 1.59 2009/08/23 20:57:40 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -39,7 +39,8 @@
/* MD Message catalog -- English, i386 version */
message md_hello
-{If you booted from a floppy, you may now remove the disk.
+{If you booted from removable media such as a USB drive or floppy disk, you
+may now remove the device.
}
CVS commit: src/distrib/utils/sysinst/arch/mac68k
Module Name:src
Committed By: sborrill
Date: Tue May 26 20:29:04 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/mac68k: md.c
Log Message:
Fix build by explicitly narrowing dlsize to an unsigned 32-bit quantity as
supported by disklabel.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/utils/sysinst/arch/mac68k/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/mac68k/md.c
diff -u src/distrib/utils/sysinst/arch/mac68k/md.c:1.53 src/distrib/utils/sysinst/arch/mac68k/md.c:1.54
--- src/distrib/utils/sysinst/arch/mac68k/md.c:1.53 Tue Oct 7 09:58:15 2008
+++ src/distrib/utils/sysinst/arch/mac68k/md.c Tue May 26 20:29:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.53 2008/10/07 09:58:15 abs Exp $ */
+/* $NetBSD: md.c,v 1.54 2009/05/26 20:29:04 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -44,6 +44,7 @@
#include fcntl.h
#include sys/ioctl.h
#include sys/utsname.h
+#include machine/int_fmtio.h
#include defs.h
#include md.h
#include msg_defs.h
@@ -1083,7 +1084,7 @@
(void)fprintf (f, %s|NetBSD installation generated:\\\n, bsddiskname);
(void)fprintf (f, \t:dt=%s:ty=winchester:\\\n, disktype);
(void)fprintf (f, \t:nc#%d:nt#%d:ns#%d:\\\n, dlcyl, dlhead, dlsec);
- (void)fprintf (f, \t:sc#%d:su#%d:\\\n, dlhead*dlsec, dlsize);
+ (void)fprintf (f, \t:sc#%d:su#% PRIu32 :\\\n, dlhead*dlsec, (uint32_t)dlsize);
(void)fprintf (f, \t:se#%d:%s\\\n, blk_size, doessf);
for (i=0; i8; i++) {
if (bsdlabel[i].pi_fstype == FS_HFS)
CVS commit: src/distrib/utils/sysinst/arch/hp700
Module Name:src Committed By: tsutsui Date: Sun May 3 11:33:05 UTC 2009 Modified Files: src/distrib/utils/sysinst/arch/hp700: md.h Log Message: Allow UFS2 (ffsv2) for root parition. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/hp700/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/hp700/md.h diff -u src/distrib/utils/sysinst/arch/hp700/md.h:1.3 src/distrib/utils/sysinst/arch/hp700/md.h:1.4 --- src/distrib/utils/sysinst/arch/hp700/md.h:1.3 Sun Feb 26 10:25:53 2006 +++ src/distrib/utils/sysinst/arch/hp700/md.h Sun May 3 11:33:05 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2006/02/26 10:25:53 dsl Exp $ */ +/* $NetBSD: md.h,v 1.4 2009/05/03 11:33:05 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -56,6 +56,9 @@ #define DEFUSRSIZE 240 /* Default /usr size, if /home */ #define XNEEDMB 80 /* Extra megs for full X installation */ +/* have support for booting from UFS2 */ +#define HAVE_UFS2_BOOT + /* * Default filesets to fetch and install during installation * or upgrade.
CVS commit: src/distrib/utils/sysinst/arch/alpha
Module Name:src
Committed By: tsutsui
Date: Wed Apr 22 12:35:46 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/alpha: md.c
Log Message:
Make sure to free(3) memory allocated by asprintf(3) in bootxx_name().
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/distrib/utils/sysinst/arch/alpha/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.46 src/distrib/utils/sysinst/arch/alpha/md.c:1.47
--- src/distrib/utils/sysinst/arch/alpha/md.c:1.46 Tue Apr 7 10:45:04 2009
+++ src/distrib/utils/sysinst/arch/alpha/md.c Wed Apr 22 12:35:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.46 2009/04/07 10:45:04 tsutsui Exp $ */
+/* $NetBSD: md.c,v 1.47 2009/04/22 12:35:46 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -127,14 +127,21 @@
md_post_newfs(void)
{
char *bootxx;
+ int error;
- printf (msg_string(MSG_dobootblks), diskdev);
+ printf(msg_string(MSG_dobootblks), diskdev);
cp_to_target(/usr/mdec/boot, /boot);
bootxx = bootxx_name();
- if (bootxx == NULL || run_program(RUN_DISPLAY | RUN_NO_CLEAR,
- /usr/sbin/installboot /dev/r%sc %s, diskdev, bootxx))
+ if (bootxx != NULL) {
+ error = run_program(RUN_DISPLAY | RUN_NO_CLEAR,
+ /usr/sbin/installboot /dev/r%sc %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;
}
CVS commit: src/distrib/utils/sysinst/arch/pmax
Module Name:src
Committed By: tsutsui
Date: Wed Apr 22 12:37:01 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/pmax: md.c md.h
Log Message:
Add UFS2 root and boot support.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/distrib/utils/sysinst/arch/pmax/md.c
cvs rdiff -u -r1.32 -r1.33 src/distrib/utils/sysinst/arch/pmax/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/pmax/md.c
diff -u src/distrib/utils/sysinst/arch/pmax/md.c:1.61 src/distrib/utils/sysinst/arch/pmax/md.c:1.62
--- src/distrib/utils/sysinst/arch/pmax/md.c:1.61 Tue Oct 7 09:58:15 2008
+++ src/distrib/utils/sysinst/arch/pmax/md.c Wed Apr 22 12:37:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.61 2008/10/07 09:58:15 abs Exp $ */
+/* $NetBSD: md.c,v 1.62 2009/04/22 12:37:01 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -141,18 +141,29 @@
int
md_post_newfs(void)
{
+ char *bootxx;
+ int error;
+
/* XXX boot blocks ... */
if (target_already_root()) {
- /* /usr is empty and we must already have bootblocks?*/
+ /* /usr is empty and we must already have bootblocks? */
return 0;
}
printf(msg_string(MSG_dobootblks), diskdev);
cp_to_target(/usr/mdec/boot.pmax, /boot.pmax);
- if (run_program(RUN_DISPLAY | RUN_NO_CLEAR,
- /usr/sbin/installboot /dev/r%sc /usr/mdec/bootxx_ffs, diskdev))
+ bootxx = bootxx_name();
+ if (bootxx != NULL) {
+ error = run_program(RUN_DISPLAY | RUN_NO_CLEAR,
+ /usr/sbin/installboot /dev/r%sc %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/pmax/md.h
diff -u src/distrib/utils/sysinst/arch/pmax/md.h:1.32 src/distrib/utils/sysinst/arch/pmax/md.h:1.33
--- src/distrib/utils/sysinst/arch/pmax/md.h:1.32 Mon Nov 12 15:07:36 2007
+++ src/distrib/utils/sysinst/arch/pmax/md.h Wed Apr 22 12:37:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.32 2007/11/12 15:07:36 jmmv Exp $ */
+/* $NetBSD: md.h,v 1.33 2009/04/22 12:37:01 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -55,6 +55,15 @@
#define DEFUSRSIZE 120 /* Default /usr size, if /home */
#define XNEEDMB 100 /* Extra megs for full X installation */
+/* 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_ffs
+#define BOOTXX_FFSV2 bootxx_ffsv2
+
/*
* Machine-specific command to write a new label to a disk.
* If not defined, we assume the port does not support disklabels and
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
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: tsutsui
Date: Sun Apr 5 22:22:27 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/hp700: md.c
src/distrib/utils/sysinst/arch/sparc64: md.c
Log Message:
Remove redundant call of check_partitions().
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/hp700/md.c
cvs rdiff -u -r1.23 -r1.24 src/distrib/utils/sysinst/arch/sparc64/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/hp700/md.c
diff -u src/distrib/utils/sysinst/arch/hp700/md.c:1.7 src/distrib/utils/sysinst/arch/hp700/md.c:1.8
--- src/distrib/utils/sysinst/arch/hp700/md.c:1.7 Tue Oct 7 09:58:14 2008
+++ src/distrib/utils/sysinst/arch/hp700/md.c Sun Apr 5 22:22:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2008/10/07 09:58:14 abs Exp $ */
+/* $NetBSD: md.c,v 1.8 2009/04/05 22:22:27 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -170,7 +170,7 @@
int
md_check_partitions(void)
{
- return check_partitions();
+ return 1;
}
/* Upgrade support */
Index: src/distrib/utils/sysinst/arch/sparc64/md.c
diff -u src/distrib/utils/sysinst/arch/sparc64/md.c:1.23 src/distrib/utils/sysinst/arch/sparc64/md.c:1.24
--- src/distrib/utils/sysinst/arch/sparc64/md.c:1.23 Tue Oct 7 09:58:16 2008
+++ src/distrib/utils/sysinst/arch/sparc64/md.c Sun Apr 5 22:22:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.23 2008/10/07 09:58:16 abs Exp $ */
+/* $NetBSD: md.c,v 1.24 2009/04/05 22:22:27 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -166,7 +166,7 @@
int
md_check_partitions(void)
{
- return check_partitions();
+ return 1;
}
/* Upgrade support */
CVS commit: src/distrib/utils/sysinst/arch/i386
Module Name:src
Committed By: ad
Date: Sat Apr 4 11:03:24 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/i386: md.c
Log Message:
Assume that extended int13 support is available if we have no diskinfo.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/distrib/utils/sysinst/arch/i386/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/i386/md.c
diff -u src/distrib/utils/sysinst/arch/i386/md.c:1.119 src/distrib/utils/sysinst/arch/i386/md.c:1.120
--- src/distrib/utils/sysinst/arch/i386/md.c:1.119 Tue Oct 7 09:58:15 2008
+++ src/distrib/utils/sysinst/arch/i386/md.c Sat Apr 4 11:03:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.119 2008/10/07 09:58:15 abs Exp $ */
+/* $NetBSD: md.c,v 1.120 2009/04/04 11:03:24 ad Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -96,7 +96,7 @@
return 0;
root_limit = 0;
- if (biosdisk == NULL || !(biosdisk-bi_flags BIFLAG_EXTINT13)) {
+ if (biosdisk != NULL (biosdisk-bi_flags BIFLAG_EXTINT13) == 0) {
if (mbr_root_above_chs()) {
msg_display(MSG_partabovechs);
process_menu(MENU_noyes, NULL);
