summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornonaka <nonaka@NetBSD.org>2009-05-16 10:40:16 +0000
committernonaka <nonaka@NetBSD.org>2009-05-16 10:40:16 +0000
commite72bdd20c73341bd3fccb5c193323e91ac15bb6d (patch)
tree0875e9bcfd14c3abc6de4cb7f5424056e340eb30
parentc69752781dc81e3732b386f1360843ed0e5c4ab1 (diff)
>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).
-rw-r--r--distrib/utils/sysinst/arch/arc/md.c5
-rw-r--r--distrib/utils/sysinst/arch/bebox/md.c5
-rw-r--r--distrib/utils/sysinst/arch/cobalt/md.c5
-rw-r--r--distrib/utils/sysinst/arch/evbmips/md.c5
-rw-r--r--distrib/utils/sysinst/arch/evbppc/md.c5
-rw-r--r--distrib/utils/sysinst/arch/hpcarm/md.c5
-rw-r--r--distrib/utils/sysinst/arch/hpcmips/md.c5
-rw-r--r--distrib/utils/sysinst/arch/landisk/md.c5
-rw-r--r--distrib/utils/sysinst/arch/ofppc/md.c5
-rw-r--r--distrib/utils/sysinst/arch/playstation2/md.c5
-rw-r--r--distrib/utils/sysinst/arch/prep/md.c5
-rw-r--r--distrib/utils/sysinst/arch/sandpoint/md.c5
-rw-r--r--distrib/utils/sysinst/arch/zaurus/md.c5
13 files changed, 39 insertions, 26 deletions
diff --git a/distrib/utils/sysinst/arch/arc/md.c b/distrib/utils/sysinst/arch/arc/md.c
index dbe02d3d4f3..fe8c2b94daf 100644
--- a/distrib/utils/sysinst/arch/arc/md.c
+++ b/distrib/utils/sysinst/arch/arc/md.c
@@ -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 @@ md_cleanup_install(void)
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)
diff --git a/distrib/utils/sysinst/arch/bebox/md.c b/distrib/utils/sysinst/arch/bebox/md.c
index 99293731e23..010e9ef3ee5 100644
--- a/distrib/utils/sysinst/arch/bebox/md.c
+++ b/distrib/utils/sysinst/arch/bebox/md.c
@@ -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 @@ md_init_set_status(int minimal)
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)
diff --git a/distrib/utils/sysinst/arch/cobalt/md.c b/distrib/utils/sysinst/arch/cobalt/md.c
index 556c090a8b5..20b075c053d 100644
--- a/distrib/utils/sysinst/arch/cobalt/md.c
+++ b/distrib/utils/sysinst/arch/cobalt/md.c
@@ -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 @@ md_cleanup_install(void)
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)
diff --git a/distrib/utils/sysinst/arch/evbmips/md.c b/distrib/utils/sysinst/arch/evbmips/md.c
index 96efa705643..7bf92376f25 100644
--- a/distrib/utils/sysinst/arch/evbmips/md.c
+++ b/distrib/utils/sysinst/arch/evbmips/md.c
@@ -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 @@ int
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)
diff --git a/distrib/utils/sysinst/arch/evbppc/md.c b/distrib/utils/sysinst/arch/evbppc/md.c
index 7a4f054464e..a3b619e402d 100644
--- a/distrib/utils/sysinst/arch/evbppc/md.c
+++ b/distrib/utils/sysinst/arch/evbppc/md.c
@@ -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 @@ int
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)
diff --git a/distrib/utils/sysinst/arch/hpcarm/md.c b/distrib/utils/sysinst/arch/hpcarm/md.c
index 3eaa75e99e8..8612090a93d 100644
--- a/distrib/utils/sysinst/arch/hpcarm/md.c
+++ b/distrib/utils/sysinst/arch/hpcarm/md.c
@@ -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 @@ md_cleanup_install(void)
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)
diff --git a/distrib/utils/sysinst/arch/hpcmips/md.c b/distrib/utils/sysinst/arch/hpcmips/md.c
index 70bbca0df04..1210d4ec300 100644
--- a/distrib/utils/sysinst/arch/hpcmips/md.c
+++ b/distrib/utils/sysinst/arch/hpcmips/md.c
@@ -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 @@ md_cleanup_install(void)
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)
diff --git a/distrib/utils/sysinst/arch/landisk/md.c b/distrib/utils/sysinst/arch/landisk/md.c
index 714291a4e21..5b3d154ddc5 100644
--- a/distrib/utils/sysinst/arch/landisk/md.c
+++ b/distrib/utils/sysinst/arch/landisk/md.c
@@ -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 @@ int
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)
diff --git a/distrib/utils/sysinst/arch/ofppc/md.c b/distrib/utils/sysinst/arch/ofppc/md.c
index 4e3ba6e601d..0dda053f25f 100644
--- a/distrib/utils/sysinst/arch/ofppc/md.c
+++ b/distrib/utils/sysinst/arch/ofppc/md.c
@@ -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 @@ md_pre_update(void)
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)
diff --git a/distrib/utils/sysinst/arch/playstation2/md.c b/distrib/utils/sysinst/arch/playstation2/md.c
index 7744298aafb..04c7db747bb 100644
--- a/distrib/utils/sysinst/arch/playstation2/md.c
+++ b/distrib/utils/sysinst/arch/playstation2/md.c
@@ -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);
diff --git a/distrib/utils/sysinst/arch/prep/md.c b/distrib/utils/sysinst/arch/prep/md.c
index bbd87f4cd0f..9e0ba653d78 100644
--- a/distrib/utils/sysinst/arch/prep/md.c
+++ b/distrib/utils/sysinst/arch/prep/md.c
@@ -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 @@ md_pre_update(void)
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)
diff --git a/distrib/utils/sysinst/arch/sandpoint/md.c b/distrib/utils/sysinst/arch/sandpoint/md.c
index 65ea4154f67..3f9e813a613 100644
--- a/distrib/utils/sysinst/arch/sandpoint/md.c
+++ b/distrib/utils/sysinst/arch/sandpoint/md.c
@@ -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 @@ md_init_set_status(int minimal)
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)
diff --git a/distrib/utils/sysinst/arch/zaurus/md.c b/distrib/utils/sysinst/arch/zaurus/md.c
index 64e223d1ecc..1276e8c7b02 100644
--- a/distrib/utils/sysinst/arch/zaurus/md.c
+++ b/distrib/utils/sysinst/arch/zaurus/md.c
@@ -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 @@ md_post_extract(void)
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)