Module Name: src
Committed By: nonaka
Date: Sat May 16 10:40:18 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/arc: md.c
src/distrib/utils/sysinst/arch/bebox: md.c
src/distrib/utils/sysinst/arch/cobalt: md.c
src/distrib/utils/sysinst/arch/evbmips: md.c
src/distrib/utils/sysinst/arch/evbppc: md.c
src/distrib/utils/sysinst/arch/hpcarm: md.c
src/distrib/utils/sysinst/arch/hpcmips: md.c
src/distrib/utils/sysinst/arch/landisk: md.c
src/distrib/utils/sysinst/arch/ofppc: md.c
src/distrib/utils/sysinst/arch/playstation2: md.c
src/distrib/utils/sysinst/arch/prep: md.c
src/distrib/utils/sysinst/arch/sandpoint: md.c
src/distrib/utils/sysinst/arch/zaurus: md.c
Log Message:
>Support drives over 1TB in size (i.e. stop errors like drive is -654343MB in
>size).
>Error if drive is over 2TB in size (and thus over the disklabel limit).
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/utils/sysinst/arch/arc/md.c
cvs rdiff -u -r1.51 -r1.52 src/distrib/utils/sysinst/arch/bebox/md.c
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/cobalt/md.c
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/evbmips/md.c
cvs rdiff -u -r1.27 -r1.28 src/distrib/utils/sysinst/arch/evbppc/md.c
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/hpcarm/md.c
cvs rdiff -u -r1.43 -r1.44 src/distrib/utils/sysinst/arch/hpcmips/md.c
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/landisk/md.c
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/ofppc/md.c
cvs rdiff -u -r1.22 -r1.23 src/distrib/utils/sysinst/arch/playstation2/md.c
cvs rdiff -u -r1.29 -r1.30 src/distrib/utils/sysinst/arch/prep/md.c
cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/sysinst/arch/sandpoint/md.c
cvs rdiff -u -r1.3 -r1.4 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/arc/md.c
diff -u src/distrib/utils/sysinst/arch/arc/md.c:1.31 src/distrib/utils/sysinst/arch/arc/md.c:1.32
--- src/distrib/utils/sysinst/arch/arc/md.c:1.31 Tue Oct 7 09:58:14 2008
+++ src/distrib/utils/sysinst/arch/arc/md.c Sat May 16 10:40:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.31 2008/10/07 09:58:14 abs Exp $ */
+/* $NetBSD: md.c,v 1.32 2009/05/16 10:40:16 nonaka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -323,7 +323,8 @@
int
md_bios_info(char *dev)
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
Index: src/distrib/utils/sysinst/arch/bebox/md.c
diff -u src/distrib/utils/sysinst/arch/bebox/md.c:1.51 src/distrib/utils/sysinst/arch/bebox/md.c:1.52
--- src/distrib/utils/sysinst/arch/bebox/md.c:1.51 Tue Oct 7 09:58:14 2008
+++ src/distrib/utils/sysinst/arch/bebox/md.c Sat May 16 10:40:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.51 2008/10/07 09:58:14 abs Exp $ */
+/* $NetBSD: md.c,v 1.52 2009/05/16 10:40:16 nonaka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -171,7 +171,8 @@
int
md_bios_info(char *dev)
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
Index: src/distrib/utils/sysinst/arch/cobalt/md.c
diff -u src/distrib/utils/sysinst/arch/cobalt/md.c:1.2 src/distrib/utils/sysinst/arch/cobalt/md.c:1.3
--- src/distrib/utils/sysinst/arch/cobalt/md.c:1.2 Tue Oct 7 09:58:14 2008
+++ src/distrib/utils/sysinst/arch/cobalt/md.c Sat May 16 10:40:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.2 2008/10/07 09:58:14 abs Exp $ */
+/* $NetBSD: md.c,v 1.3 2009/05/16 10:40:16 nonaka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -338,7 +338,8 @@
int
md_bios_info(char *dev)
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
Index: src/distrib/utils/sysinst/arch/evbmips/md.c
diff -u src/distrib/utils/sysinst/arch/evbmips/md.c:1.4 src/distrib/utils/sysinst/arch/evbmips/md.c:1.5
--- src/distrib/utils/sysinst/arch/evbmips/md.c:1.4 Tue Oct 7 09:58:14 2008
+++ src/distrib/utils/sysinst/arch/evbmips/md.c Sat May 16 10:40:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2008/10/07 09:58:14 abs Exp $ */
+/* $NetBSD: md.c,v 1.5 2009/05/16 10:40:16 nonaka Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -152,7 +152,8 @@
md_bios_info(dev)
char *dev;
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
Index: src/distrib/utils/sysinst/arch/evbppc/md.c
diff -u src/distrib/utils/sysinst/arch/evbppc/md.c:1.27 src/distrib/utils/sysinst/arch/evbppc/md.c:1.28
--- src/distrib/utils/sysinst/arch/evbppc/md.c:1.27 Tue Oct 7 09:58:14 2008
+++ src/distrib/utils/sysinst/arch/evbppc/md.c Sat May 16 10:40:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.27 2008/10/07 09:58:14 abs Exp $ */
+/* $NetBSD: md.c,v 1.28 2009/05/16 10:40:17 nonaka Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -176,7 +176,8 @@
md_bios_info(dev)
char *dev;
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
Index: src/distrib/utils/sysinst/arch/hpcarm/md.c
diff -u src/distrib/utils/sysinst/arch/hpcarm/md.c:1.5 src/distrib/utils/sysinst/arch/hpcarm/md.c:1.6
--- src/distrib/utils/sysinst/arch/hpcarm/md.c:1.5 Tue Oct 7 09:58:14 2008
+++ src/distrib/utils/sysinst/arch/hpcarm/md.c Sat May 16 10:40:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2008/10/07 09:58:14 abs Exp $ */
+/* $NetBSD: md.c,v 1.6 2009/05/16 10:40:17 nonaka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -139,7 +139,8 @@
int
md_bios_info(char *dev)
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
Index: src/distrib/utils/sysinst/arch/hpcmips/md.c
diff -u src/distrib/utils/sysinst/arch/hpcmips/md.c:1.43 src/distrib/utils/sysinst/arch/hpcmips/md.c:1.44
--- src/distrib/utils/sysinst/arch/hpcmips/md.c:1.43 Tue Oct 7 09:58:15 2008
+++ src/distrib/utils/sysinst/arch/hpcmips/md.c Sat May 16 10:40:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.43 2008/10/07 09:58:15 abs Exp $ */
+/* $NetBSD: md.c,v 1.44 2009/05/16 10:40:17 nonaka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -138,7 +138,8 @@
int
md_bios_info(char *dev)
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
Index: src/distrib/utils/sysinst/arch/landisk/md.c
diff -u src/distrib/utils/sysinst/arch/landisk/md.c:1.5 src/distrib/utils/sysinst/arch/landisk/md.c:1.6
--- src/distrib/utils/sysinst/arch/landisk/md.c:1.5 Wed Apr 22 17:21:47 2009
+++ src/distrib/utils/sysinst/arch/landisk/md.c Sat May 16 10:40:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2009/04/22 17:21:47 tsutsui Exp $ */
+/* $NetBSD: md.c,v 1.6 2009/05/16 10:40:17 nonaka Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -175,7 +175,8 @@
md_bios_info(dev)
char *dev;
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
Index: src/distrib/utils/sysinst/arch/ofppc/md.c
diff -u src/distrib/utils/sysinst/arch/ofppc/md.c:1.4 src/distrib/utils/sysinst/arch/ofppc/md.c:1.5
--- src/distrib/utils/sysinst/arch/ofppc/md.c:1.4 Tue Oct 7 09:58:15 2008
+++ src/distrib/utils/sysinst/arch/ofppc/md.c Sat May 16 10:40:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2008/10/07 09:58:15 abs Exp $ */
+/* $NetBSD: md.c,v 1.5 2009/05/16 10:40:17 nonaka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -493,7 +493,8 @@
int
md_bios_info(char *dev)
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
Index: src/distrib/utils/sysinst/arch/playstation2/md.c
diff -u src/distrib/utils/sysinst/arch/playstation2/md.c:1.22 src/distrib/utils/sysinst/arch/playstation2/md.c:1.23
--- src/distrib/utils/sysinst/arch/playstation2/md.c:1.22 Tue Oct 7 09:58:15 2008
+++ src/distrib/utils/sysinst/arch/playstation2/md.c Sat May 16 10:40:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.22 2008/10/07 09:58:15 abs Exp $ */
+/* $NetBSD: md.c,v 1.23 2009/05/16 10:40:17 nonaka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,7 +50,8 @@
int
md_get_info()
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
read_mbr(diskdev, &mbr);
Index: src/distrib/utils/sysinst/arch/prep/md.c
diff -u src/distrib/utils/sysinst/arch/prep/md.c:1.29 src/distrib/utils/sysinst/arch/prep/md.c:1.30
--- src/distrib/utils/sysinst/arch/prep/md.c:1.29 Tue Oct 7 09:58:15 2008
+++ src/distrib/utils/sysinst/arch/prep/md.c Sat May 16 10:40:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.29 2008/10/07 09:58:15 abs Exp $ */
+/* $NetBSD: md.c,v 1.30 2009/05/16 10:40:17 nonaka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -254,7 +254,8 @@
int
md_bios_info(char *dev)
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
Index: src/distrib/utils/sysinst/arch/sandpoint/md.c
diff -u src/distrib/utils/sysinst/arch/sandpoint/md.c:1.28 src/distrib/utils/sysinst/arch/sandpoint/md.c:1.29
--- src/distrib/utils/sysinst/arch/sandpoint/md.c:1.28 Tue Oct 7 09:58:15 2008
+++ src/distrib/utils/sysinst/arch/sandpoint/md.c Sat May 16 10:40:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.28 2008/10/07 09:58:15 abs Exp $ */
+/* $NetBSD: md.c,v 1.29 2009/05/16 10:40:17 nonaka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -175,7 +175,8 @@
int
md_bios_info(char *dev)
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
Index: src/distrib/utils/sysinst/arch/zaurus/md.c
diff -u src/distrib/utils/sysinst/arch/zaurus/md.c:1.3 src/distrib/utils/sysinst/arch/zaurus/md.c:1.4
--- src/distrib/utils/sysinst/arch/zaurus/md.c:1.3 Tue Oct 7 09:58:16 2008
+++ src/distrib/utils/sysinst/arch/zaurus/md.c Sat May 16 10:40:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.3 2008/10/07 09:58:16 abs Exp $ */
+/* $NetBSD: md.c,v 1.4 2009/05/16 10:40:17 nonaka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -177,7 +177,8 @@
int
md_bios_info(char *dev)
{
- int cyl, head, sec;
+ int cyl, head;
+ daddr_t sec;
msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
