Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/utils/sysinst Convert ask_sizemult to take an argume...
details: https://anonhg.NetBSD.org/src/rev/6df6603f9a11
branches: trunk
changeset: 483644:6df6603f9a11
user: fvdl <fvdl%NetBSD.org@localhost>
date: Tue Mar 14 22:42:48 2000 +0000
description:
Convert ask_sizemult to take an argument, so that MBR using ports can
actually call it with the right sectors per cylinder size during
MBR partitioning.
diffstat:
distrib/utils/sysinst/arch/alpha/md.c | 6 +++---
distrib/utils/sysinst/arch/alpha/menus.md.en | 6 +++---
distrib/utils/sysinst/arch/alpha/menus.md.fr | 6 +++---
distrib/utils/sysinst/arch/amiga/menus.md.en | 6 +++---
distrib/utils/sysinst/arch/amiga/menus.md.fr | 8 ++++----
distrib/utils/sysinst/arch/arm32/md.c | 6 +++---
distrib/utils/sysinst/arch/arm32/menus.md.en | 6 +++---
distrib/utils/sysinst/arch/arm32/menus.md.fr | 6 +++---
distrib/utils/sysinst/arch/bebox/md.c | 6 +++---
distrib/utils/sysinst/arch/bebox/menus.md.en | 8 ++++----
distrib/utils/sysinst/arch/bebox/menus.md.fr | 8 ++++----
distrib/utils/sysinst/arch/hpcmips/md.c | 6 +++---
distrib/utils/sysinst/arch/hpcmips/menus.md.en | 8 ++++----
distrib/utils/sysinst/arch/hpcmips/menus.md.fr | 8 ++++----
distrib/utils/sysinst/arch/i386/md.c | 6 +++---
distrib/utils/sysinst/arch/i386/menus.md.en | 8 ++++----
distrib/utils/sysinst/arch/i386/menus.md.fr | 8 ++++----
distrib/utils/sysinst/arch/mac68k/menus.md.en | 6 +++---
distrib/utils/sysinst/arch/macppc/md.c | 6 +++---
distrib/utils/sysinst/arch/macppc/menus.md.en | 6 +++---
distrib/utils/sysinst/arch/macppc/menus.md.fr | 6 +++---
distrib/utils/sysinst/arch/news68k/md.c | 6 +++---
distrib/utils/sysinst/arch/news68k/menus.md.en | 6 +++---
distrib/utils/sysinst/arch/news68k/menus.md.fr | 6 +++---
distrib/utils/sysinst/arch/pc532/md.c | 6 +++---
distrib/utils/sysinst/arch/pc532/menus.md.en | 6 +++---
distrib/utils/sysinst/arch/pc532/menus.md.fr | 6 +++---
distrib/utils/sysinst/arch/pmax/menus.md.en | 6 +++---
distrib/utils/sysinst/arch/pmax/menus.md.fr | 6 +++---
distrib/utils/sysinst/arch/sparc/menus.md.en | 6 +++---
distrib/utils/sysinst/arch/sparc/menus.md.fr | 6 +++---
distrib/utils/sysinst/arch/vax/menus.md.en | 6 +++---
distrib/utils/sysinst/arch/vax/menus.md.fr | 6 +++---
distrib/utils/sysinst/arch/x68k/menus.md.en | 6 +++---
distrib/utils/sysinst/bsddisklabel.c | 6 +++---
distrib/utils/sysinst/defs.h | 7 ++++---
distrib/utils/sysinst/mbr.c | 4 ++--
distrib/utils/sysinst/menus.mi.en | 4 ++--
distrib/utils/sysinst/menus.mi.fr | 4 ++--
distrib/utils/sysinst/msg.mi.en | 4 ++--
distrib/utils/sysinst/msg.mi.fr | 4 ++--
distrib/utils/sysinst/util.c | 13 ++++++++-----
42 files changed, 134 insertions(+), 130 deletions(-)
diffs (truncated from 1165 to 300 lines):
diff -r 6fc0ad9e43bf -r 6df6603f9a11 distrib/utils/sysinst/arch/alpha/md.c
--- a/distrib/utils/sysinst/arch/alpha/md.c Tue Mar 14 22:37:55 2000 +0000
+++ b/distrib/utils/sysinst/arch/alpha/md.c Tue Mar 14 22:42:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.18 1999/08/16 08:29:05 abs Exp $ */
+/* $NetBSD: md.c,v 1.19 2000/03/14 22:42:50 fvdl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -169,7 +169,7 @@
process_menu (MENU_layout);
if (layoutkind == 3) {
- ask_sizemult();
+ ask_sizemult(dlcylsize);
} else {
sizemult = MEG / sectorsize;
multname = msg_string(MSG_megname);
@@ -232,7 +232,7 @@
break;
case 3: /* custom: ask user for all sizes */
- ask_sizemult();
+ ask_sizemult(dlcylsize);
/* root */
partstart = ptstart;
remain = fsdsize - partstart;
diff -r 6fc0ad9e43bf -r 6df6603f9a11 distrib/utils/sysinst/arch/alpha/menus.md.en
--- a/distrib/utils/sysinst/arch/alpha/menus.md.en Tue Mar 14 22:37:55 2000 +0000
+++ b/distrib/utils/sysinst/arch/alpha/menus.md.en Tue Mar 14 22:42:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.en,v 1.10 1999/07/04 22:31:38 cgd Exp $ */
+/* $NetBSD: menus.md.en,v 1.11 2000/03/14 22:42:50 fvdl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,7 +41,7 @@
menu editfsparts, y=12, exit;
display action {
- ask_sizemult();
+ ask_sizemult(dlcylsize);
msg_display(MSG_fspart, disk->dd_name, multname);
disp_cur_fspart(-1, 1);
};
@@ -53,7 +53,7 @@
option "Change f", action { editpart = F;}, sub menu edfspart;
option "Change g", action { editpart = G;}, sub menu edfspart;
option "Change h", action { editpart = H;}, sub menu edfspart;
- option "Set new allocation size", action { reask_sizemult(); };
+ option "Set new allocation size", action { reask_sizemult(dlcylsize); };
menu md_distcustom, x=26, y=5, exit, title "Selection toggles inclusion";
display action { show_cur_distsets (); };
diff -r 6fc0ad9e43bf -r 6df6603f9a11 distrib/utils/sysinst/arch/alpha/menus.md.fr
--- a/distrib/utils/sysinst/arch/alpha/menus.md.fr Tue Mar 14 22:37:55 2000 +0000
+++ b/distrib/utils/sysinst/arch/alpha/menus.md.fr Tue Mar 14 22:42:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.fr,v 1.11 1999/07/04 22:31:38 cgd Exp $ */
+/* $NetBSD: menus.md.fr,v 1.12 2000/03/14 22:42:50 fvdl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,7 +41,7 @@
menu editfsparts, y=12, exit;
display action {
- ask_sizemult();
+ ask_sizemult(dlcylsize);
msg_display(MSG_fspart, disk->dd_name, multname);
disp_cur_fspart(-1, 1);
};
@@ -53,7 +53,7 @@
option "Changer f", action { editpart = F;}, sub menu edfspart;
option "Changer g", action { editpart = G;}, sub menu edfspart;
option "Changer h", action { editpart = H;}, sub menu edfspart;
- option "Nouvelle taille d'allocation", action { reask_sizemult(); };
+ option "Nouvelle taille d'allocation", action { reask_sizemult(dlcylsize); };
menu md_distcustom, x=26, y=5, exit, title "Sélection des composants";
display action { show_cur_distsets (); };
diff -r 6fc0ad9e43bf -r 6df6603f9a11 distrib/utils/sysinst/arch/amiga/menus.md.en
--- a/distrib/utils/sysinst/arch/amiga/menus.md.en Tue Mar 14 22:37:55 2000 +0000
+++ b/distrib/utils/sysinst/arch/amiga/menus.md.en Tue Mar 14 22:42:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.en,v 1.1 2000/02/20 20:34:58 is Exp $ */
+/* $NetBSD: menus.md.en,v 1.2 2000/03/14 22:42:50 fvdl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -73,7 +73,7 @@
menu editfsparts, y=13, exit;
display action {
- ask_sizemult();
+ ask_sizemult(dlcylsize);
msg_display(MSG_fspart, multname);
disp_cur_fspart(-1, 1);
};
@@ -85,7 +85,7 @@
option "Change f", action { editpart = F;}, sub menu edfspart;
option "Change g", action { editpart = G;}, sub menu edfspart;
option "Change h", action { editpart = H;}, sub menu edfspart;
- option "Set new allocation size", action { reask_sizemult(); };
+ option "Set new allocation size", action { reask_sizemult(dlcylsize); };
menu md_distcustom, y=3, exit, title "Selection toggles inclusion";
diff -r 6fc0ad9e43bf -r 6df6603f9a11 distrib/utils/sysinst/arch/amiga/menus.md.fr
--- a/distrib/utils/sysinst/arch/amiga/menus.md.fr Tue Mar 14 22:37:55 2000 +0000
+++ b/distrib/utils/sysinst/arch/amiga/menus.md.fr Tue Mar 14 22:42:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.fr,v 1.1 2000/02/20 20:34:58 is Exp $ */
+/* $NetBSD: menus.md.fr,v 1.2 2000/03/14 22:42:50 fvdl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -90,7 +90,7 @@
option "Edition de la partition 3", sub menu editpart,
action { editpart = 3; };
option "Changer d'untité",
- action { reask_sizemult(); };
+ action { reask_sizemult(bcylsize); };
menu editpart, title "Changement";
display action { msg_display (MSG_editpart, editpart);
@@ -145,7 +145,7 @@
menu editfsparts, y=13, exit;
display action {
- ask_sizemult();
+ ask_sizemult(dlcylsize);
msg_display(MSG_fspart, multname);
disp_cur_fspart(-1, 1);
};
@@ -157,7 +157,7 @@
option "Changer f", action { editpart = F;}, sub menu edfspart;
option "Changer g", action { editpart = G;}, sub menu edfspart;
option "Changer h", action { editpart = H;}, sub menu edfspart;
- option "Changer d'unité", action { reask_sizemult(); };
+ option "Changer d'unité", action { reask_sizemult(dlcylsize); };
menu md_distcustom, y=3, exit, title "Sélection des composants";
diff -r 6fc0ad9e43bf -r 6df6603f9a11 distrib/utils/sysinst/arch/arm32/md.c
--- a/distrib/utils/sysinst/arch/arm32/md.c Tue Mar 14 22:37:55 2000 +0000
+++ b/distrib/utils/sysinst/arch/arm32/md.c Tue Mar 14 22:42:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.22 1999/08/16 08:29:05 abs Exp $ */
+/* $NetBSD: md.c,v 1.23 2000/03/14 22:42:50 fvdl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -326,7 +326,7 @@
process_menu(MENU_layout);
if (layoutkind == 3) {
- ask_sizemult();
+ ask_sizemult(dlcylsize);
} else {
sizemult = MEG / sectorsize;
multname = msg_string(MSG_megname);
@@ -393,7 +393,7 @@
break;
case 3: /* custom: ask user for all sizes */
- ask_sizemult();
+ ask_sizemult(dlcylsize);
partstart = ptstart;
remain = fsptsize;
diff -r 6fc0ad9e43bf -r 6df6603f9a11 distrib/utils/sysinst/arch/arm32/menus.md.en
--- a/distrib/utils/sysinst/arch/arm32/menus.md.en Tue Mar 14 22:37:55 2000 +0000
+++ b/distrib/utils/sysinst/arch/arm32/menus.md.en Tue Mar 14 22:42:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.en,v 1.9 1999/07/04 22:31:38 cgd Exp $ */
+/* $NetBSD: menus.md.en,v 1.10 2000/03/14 22:42:50 fvdl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,7 +41,7 @@
menu editfsparts, y=12, exit;
display action {
- ask_sizemult();
+ ask_sizemult(dlcylsize);
msg_display(MSG_arm32fspart, disk->dd_name, multname);
disp_cur_fspart(-1, 1);
};
@@ -53,7 +53,7 @@
option "Change f", action { editpart = F;}, sub menu edfspart;
option "Change g", action { editpart = G;}, sub menu edfspart;
option "Change h", action { editpart = H;}, sub menu edfspart;
- option "Set new allocation size", action { reask_sizemult(); };
+ option "Set new allocation size", action { reask_sizemult(dlcylsize); };
menu md_distcustom, x=26, y=5, exit, title "Selection toggles inclusion";
display action { show_cur_distsets (); };
diff -r 6fc0ad9e43bf -r 6df6603f9a11 distrib/utils/sysinst/arch/arm32/menus.md.fr
--- a/distrib/utils/sysinst/arch/arm32/menus.md.fr Tue Mar 14 22:37:55 2000 +0000
+++ b/distrib/utils/sysinst/arch/arm32/menus.md.fr Tue Mar 14 22:42:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.fr,v 1.9 1999/07/04 22:31:38 cgd Exp $ */
+/* $NetBSD: menus.md.fr,v 1.10 2000/03/14 22:42:50 fvdl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,7 +41,7 @@
menu editfsparts, y=12, exit;
display action {
- ask_sizemult();
+ ask_sizemult(dlcylsize);
msg_display(MSG_arm32fspart, disk->dd_name, multname);
disp_cur_fspart(-1, 1);
};
@@ -53,7 +53,7 @@
option "Changer f", action { editpart = F;}, sub menu edfspart;
option "Changer g", action { editpart = G;}, sub menu edfspart;
option "Changer h", action { editpart = H;}, sub menu edfspart;
- option "Nouvelle taille d'allocation", action { reask_sizemult(); };
+ option "Nouvelle taille d'allocation", action { reask_sizemult(dlcylsize); };
menu md_distcustom, x=26, y=5, exit, title "Sélection des composants";
display action { show_cur_distsets (); };
diff -r 6fc0ad9e43bf -r 6df6603f9a11 distrib/utils/sysinst/arch/bebox/md.c
--- a/distrib/utils/sysinst/arch/bebox/md.c Tue Mar 14 22:37:55 2000 +0000
+++ b/distrib/utils/sysinst/arch/bebox/md.c Tue Mar 14 22:42:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.14 1999/08/16 08:29:05 abs Exp $ */
+/* $NetBSD: md.c,v 1.15 2000/03/14 22:42:51 fvdl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -131,7 +131,7 @@
process_menu (MENU_layout);
if (layoutkind == 3) {
- ask_sizemult();
+ ask_sizemult(dlcylsize);
} else {
sizemult = MEG / sectorsize;
multname = msg_string(MSG_megname);
@@ -195,7 +195,7 @@
break;
case 3: /* custom: ask user for all sizes */
- ask_sizemult();
+ ask_sizemult(dlcylsize);
partstart = ptstart;
remain = fsptsize;
diff -r 6fc0ad9e43bf -r 6df6603f9a11 distrib/utils/sysinst/arch/bebox/menus.md.en
--- a/distrib/utils/sysinst/arch/bebox/menus.md.en Tue Mar 14 22:37:55 2000 +0000
+++ b/distrib/utils/sysinst/arch/bebox/menus.md.en Tue Mar 14 22:42:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.en,v 1.9 1999/07/04 22:31:38 cgd Exp $ */
+/* $NetBSD: menus.md.en,v 1.10 2000/03/14 22:42:51 fvdl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -88,7 +88,7 @@
option "Edit partition 3", sub menu editpart,
action { editpart = 3; };
option "Reselect size specification",
- action { reask_sizemult(); };
+ action { reask_sizemult(bcylsize); };
menu editpart, title "Select to change";
display action { msg_display (MSG_editpart, editpart);
@@ -163,7 +163,7 @@
menu editfsparts, y=12, exit;
display action {
- ask_sizemult();
+ ask_sizemult(dlcylsize);
msg_display(MSG_fspart, multname);
disp_cur_fspart(-1, 1);
};
@@ -175,7 +175,7 @@
option "Change f", action { editpart = F;}, sub menu edfspart;
option "Change g", action { editpart = G;}, sub menu edfspart;
option "Change h", action { editpart = H;}, sub menu edfspart;
- option "Set new allocation size", action { reask_sizemult(); };
+ option "Set new allocation size", action { reask_sizemult(dlcylsize); };
menu md_distcustom, x=26, y=5, exit, title "Selection toggles inclusion";
diff -r 6fc0ad9e43bf -r 6df6603f9a11 distrib/utils/sysinst/arch/bebox/menus.md.fr
--- a/distrib/utils/sysinst/arch/bebox/menus.md.fr Tue Mar 14 22:37:55 2000 +0000
+++ b/distrib/utils/sysinst/arch/bebox/menus.md.fr Tue Mar 14 22:42:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.fr,v 1.9 1999/07/04 22:31:38 cgd Exp $ */
+/* $NetBSD: menus.md.fr,v 1.10 2000/03/14 22:42:51 fvdl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -90,7 +90,7 @@
option "Edition de la partition 3", sub menu editpart,
action { editpart = 3; };
Home |
Main Index |
Thread Index |
Old Index