summaryrefslogtreecommitdiff
path: root/distrib/utils
diff options
context:
space:
mode:
Diffstat (limited to 'distrib/utils')
-rw-r--r--distrib/utils/sysinst/arch/arc/md.c4
-rw-r--r--distrib/utils/sysinst/arch/bebox/md.c4
-rw-r--r--distrib/utils/sysinst/arch/evbppc/md.c4
-rw-r--r--distrib/utils/sysinst/arch/hpcmips/md.c4
-rw-r--r--distrib/utils/sysinst/arch/i386/md.c7
-rw-r--r--distrib/utils/sysinst/arch/playstation2/md.c5
-rw-r--r--distrib/utils/sysinst/arch/pmppc/md.c4
-rw-r--r--distrib/utils/sysinst/arch/sandpoint/md.c4
-rw-r--r--distrib/utils/sysinst/mbr.c14
-rw-r--r--distrib/utils/sysinst/mbr.h4
10 files changed, 18 insertions, 36 deletions
diff --git a/distrib/utils/sysinst/arch/arc/md.c b/distrib/utils/sysinst/arch/arc/md.c
index 3c45c1d4e13..c06e38ec5e7 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.23 2004/07/17 10:55:03 dsl Exp $ */
+/* $NetBSD: md.c,v 1.24 2004/07/17 19:36:59 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -168,9 +168,7 @@ md_bios_info(char *dev)
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
msg_display_add(MSG_biosguess, cyl, head, sec);
set_bios_geom(cyl, head, sec);
- bsize = dlsize;
- bcylsize = bhead * bsec;
return 0;
}
diff --git a/distrib/utils/sysinst/arch/bebox/md.c b/distrib/utils/sysinst/arch/bebox/md.c
index 4e5b5d64089..15ad55aee87 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.45 2004/06/06 06:06:59 christos Exp $ */
+/* $NetBSD: md.c,v 1.46 2004/07/17 19:36:59 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -174,8 +174,6 @@ md_bios_info(char *dev)
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
msg_display_add(MSG_biosguess, cyl, head, sec);
set_bios_geom(cyl, head, sec);
- bsize = bcyl * bhead * bsec;
- bcylsize = bhead * bsec;
return 0;
}
diff --git a/distrib/utils/sysinst/arch/evbppc/md.c b/distrib/utils/sysinst/arch/evbppc/md.c
index fd5a0389f5f..11f32611b0d 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.20 2004/06/06 06:06:59 christos Exp $ */
+/* $NetBSD: md.c,v 1.21 2004/07/17 19:36:59 dsl Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -178,8 +178,6 @@ md_bios_info(dev)
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
msg_display_add(MSG_biosguess, cyl, head, sec);
set_bios_geom(cyl, head, sec);
- bsize = bcyl * bhead * bsec;
- bcylsize = bhead * bsec;
return 0;
}
diff --git a/distrib/utils/sysinst/arch/hpcmips/md.c b/distrib/utils/sysinst/arch/hpcmips/md.c
index d95b8487f85..9dcfaab3aa3 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.37 2004/06/06 06:07:00 christos Exp $ */
+/* $NetBSD: md.c,v 1.38 2004/07/17 19:36:59 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -153,8 +153,6 @@ md_bios_info(char *dev)
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
msg_display_add(MSG_biosguess, cyl, head, sec);
set_bios_geom(cyl, head, sec);
- bsize = bcyl * bhead * bsec;
- bcylsize = bhead * bsec;
return 0;
}
diff --git a/distrib/utils/sysinst/arch/i386/md.c b/distrib/utils/sysinst/arch/i386/md.c
index ae8a773a094..23483104e4b 100644
--- a/distrib/utils/sysinst/arch/i386/md.c
+++ b/distrib/utils/sysinst/arch/i386/md.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.104 2004/07/17 10:55:04 dsl Exp $ */
+/* $NetBSD: md.c,v 1.105 2004/07/17 19:37:00 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -561,11 +561,6 @@ nogeom:
bhead = biosdisk->bi_head;
bsec = biosdisk->bi_sec;
}
- if (biosdisk != NULL && (biosdisk->bi_flags & BIFLAG_EXTINT13))
- bsize = dlsize;
- else
- bsize = bcyl * bhead * bsec;
- bcylsize = bhead * bsec;
return 0;
}
diff --git a/distrib/utils/sysinst/arch/playstation2/md.c b/distrib/utils/sysinst/arch/playstation2/md.c
index aaa35191c1f..fa58c75fe7f 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.16 2004/06/06 06:07:01 christos Exp $ */
+/* $NetBSD: md.c,v 1.17 2004/07/17 19:37:00 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -62,9 +62,6 @@ md_get_info()
msg_display_add(MSG_biosguess, cyl, head, sec);
set_bios_geom(cyl, head, sec);
- bsize = bcyl * bhead * bsec;
- bcylsize = bhead * bsec;
-
edit_mbr(&mbr);
return (1);
diff --git a/distrib/utils/sysinst/arch/pmppc/md.c b/distrib/utils/sysinst/arch/pmppc/md.c
index ea63dfc632c..b83b43edcc0 100644
--- a/distrib/utils/sysinst/arch/pmppc/md.c
+++ b/distrib/utils/sysinst/arch/pmppc/md.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.2 2004/06/06 06:07:01 christos Exp $ */
+/* $NetBSD: md.c,v 1.3 2004/07/17 19:37:00 dsl Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -179,8 +179,6 @@ md_bios_info(dev)
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
msg_display_add(MSG_biosguess, cyl, head, sec);
set_bios_geom(cyl, head, sec);
- bsize = bcyl * bhead * bsec;
- bcylsize = bhead * bsec;
return 0;
}
diff --git a/distrib/utils/sysinst/arch/sandpoint/md.c b/distrib/utils/sysinst/arch/sandpoint/md.c
index e03a66266b3..3a283f45d8f 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.22 2004/06/06 06:07:01 christos Exp $ */
+/* $NetBSD: md.c,v 1.23 2004/07/17 19:37:00 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -177,8 +177,6 @@ md_bios_info(char *dev)
if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
msg_display_add(MSG_biosguess, cyl, head, sec);
set_bios_geom(cyl, head, sec);
- bsize = bcyl * bhead * bsec;
- bcylsize = bhead * bsec;
return 0;
}
diff --git a/distrib/utils/sysinst/mbr.c b/distrib/utils/sysinst/mbr.c
index 4a813e92198..02726b13022 100644
--- a/distrib/utils/sysinst/mbr.c
+++ b/distrib/utils/sysinst/mbr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.62 2004/04/25 21:55:18 dsl Exp $ */
+/* $NetBSD: mbr.c,v 1.63 2004/07/17 19:36:59 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -722,11 +722,11 @@ edit_mbr_size(menudesc *m, void *arg)
/* Round end to cylinder boundary */
if (sizemult != 1) {
new *= sizemult;
- new += ROUNDDOWN(start, bcylsize);
- new = ROUNDUP(new, bcylsize);
+ new += ROUNDDOWN(start,current_cylsize);
+ new = ROUNDUP(new, current_cylsize);
new -= start;
while (new <= 0)
- new += bcylsize;
+ new += current_cylsize;
}
}
}
@@ -1271,8 +1271,10 @@ edit_mbr(mbr_info_t *mbri)
return 0;
/* Ask for sizes, which partitions, ... */
- sizemult = MEG / sectorsize;
- ask_sizemult(bcylsize);
+ set_sizemultname_meg();
+ /* ask_sizemult() is due for the chop, when this will be needed */
+ /* current_cylsize = bhead * bsec; */
+ ask_sizemult(bhead * bsec);
for (;;) {
ptstart = 0;
diff --git a/distrib/utils/sysinst/mbr.h b/distrib/utils/sysinst/mbr.h
index 3f000587223..df4fa566920 100644
--- a/distrib/utils/sysinst/mbr.h
+++ b/distrib/utils/sysinst/mbr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.h,v 1.20 2004/06/06 06:06:59 christos Exp $ */
+/* $NetBSD: mbr.h,v 1.21 2004/07/17 19:36:59 dsl Exp $ */
/*
* Copyright 1997, 1988 Piermont Information Systems Inc.
@@ -78,7 +78,7 @@ struct mbr_info_t {
};
/* incore fdisk (mbr, bios) geometry */
-int bcyl, bhead, bsec, bsize, bcylsize;
+int bcyl, bhead, bsec;
mbr_info_t mbr;