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;i<map.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;i<map.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 (map.root_cnt++ == 0)
strcpy (bzb->mount_point, "/");
else {
- if (map.usr_cnt++ == 0)
- strcpy (bzb->mount_point, "/usr");
+ if (map.usr_cnt++ == 0)
+ strcpy (bzb->mount_point, "/usr");
} };
option "MacOS HFS", exit, action {
int j;
Index: src/distrib/utils/sysinst/arch/mac68k/menus.md.en
diff -u src/distrib/utils/sysinst/arch/mac68k/menus.md.en:1.21 src/distrib/utils/sysinst/arch/mac68k/menus.md.en:1.22
--- src/distrib/utils/sysinst/arch/mac68k/menus.md.en:1.21 Sat May 24 21:42:52 2008
+++ src/distrib/utils/sysinst/arch/mac68k/menus.md.en Sat Jan 2 17:15:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.en,v 1.21 2008/05/24 21:42:52 hauke Exp $ */
+/* $NetBSD: menus.md.en,v 1.22 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;i<map.size;i++)
memcpy (&map.blk[i], &new_map[i],
sizeof(struct apple_part_map_entry));
- };
+ };
menu editparttable, title "Choose your 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 "Select next partition", action {
map.selected += 1;
@@ -104,7 +104,7 @@
strcpy ((char *)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;i<map.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 "Fix selected partition", 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 "Fix selected partition", 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 "Abort?", 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 ((char *)bzb->mount_point, "/");
else
strcpy ((char *)bzb->mount_point, "/altroot");
@@ -233,8 +233,8 @@
if (map.root_cnt++ == 0)
strcpy ((char *)bzb->mount_point, "/");
else {
- if (map.usr_cnt++ == 0)
- strcpy ((char *)bzb->mount_point, "/usr");
+ if (map.usr_cnt++ == 0)
+ strcpy ((char *)bzb->mount_point, "/usr");
} };
option "MacOS HFS", exit, action {
int j;
Index: src/distrib/utils/sysinst/arch/mac68k/menus.md.es
diff -u src/distrib/utils/sysinst/arch/mac68k/menus.md.es:1.2 src/distrib/utils/sysinst/arch/mac68k/menus.md.es:1.3
--- src/distrib/utils/sysinst/arch/mac68k/menus.md.es:1.2 Sat May 24 21:42:52 2008
+++ src/distrib/utils/sysinst/arch/mac68k/menus.md.es Sat Jan 2 17:15:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.es,v 1.2 2008/05/24 21:42:52 hauke Exp $ */
+/* $NetBSD: menus.md.es,v 1.3 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;i<map.size;i++)
memcpy (&map.blk[i], &new_map[i],
sizeof(struct apple_part_map_entry));
- };
+ };
menu editparttable, title "Escoja su particion", 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 "Seleccione particion siguiente", 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;i<map.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 "Arreglar particion seleccionada", 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 "Arreglar particion seleccionada", 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 "¿Abortar?", 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 (map.root_cnt++ == 0)
strcpy (bzb->mount_point, "/");
else {
- if (map.usr_cnt++ == 0)
- strcpy (bzb->mount_point, "/usr");
+ if (map.usr_cnt++ == 0)
+ strcpy (bzb->mount_point, "/usr");
} };
option "MacOS HFS", exit, action {
int j;
Index: src/distrib/utils/sysinst/arch/mac68k/menus.md.pl
diff -u src/distrib/utils/sysinst/arch/mac68k/menus.md.pl:1.8 src/distrib/utils/sysinst/arch/mac68k/menus.md.pl:1.9
--- src/distrib/utils/sysinst/arch/mac68k/menus.md.pl:1.8 Sat May 24 21:42:52 2008
+++ src/distrib/utils/sysinst/arch/mac68k/menus.md.pl Sat Jan 2 17:15:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.pl,v 1.8 2008/05/24 21:42:52 hauke Exp $ */
+/* $NetBSD: menus.md.pl,v 1.9 2010/01/02 17:15:07 dsl Exp $ */
/* Based on english version: */
/* NetBSD: menus.md.en,v 1.13 2001/11/29 23:20:58 thorpej Exp */
@@ -50,108 +50,108 @@
endwin(); exit(1);
};
option "Zainicjuj Mape partycji Dysku", exit, action {
- int i;
+ int i;
- msg_clear();
- msg_display (MSG_okwritediskmap);
- process_menu (MENU_okabort, NULL);
- if (!yesno) {
- endwin();
- return 0;
- }
- 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;i<map.size;i++)
- memcpy (&map.blk[i], &new_map[i],
- sizeof(struct apple_part_map_entry));
+ msg_clear();
+ msg_display (MSG_okwritediskmap);
+ process_menu (MENU_okabort, NULL);
+ if (!yesno) {
+ endwin();
+ return 0;
+ }
+ 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;i<map.size;i++)
+ memcpy (&map.blk[i], &new_map[i],
+ sizeof(struct apple_part_map_entry));
};
menu editparttable, title "Wybierz swoje partycje", exit, y=14;
display action { msg_display (MSG_editparttable);
- sortmerge();
- if (map.selected >= map.usable_cnt)
- map.selected = 0;
- disp_selected_part (map.selected);
+ sortmerge();
+ if (map.selected >= map.usable_cnt)
+ map.selected = 0;
+ disp_selected_part (map.selected);
};
option "Wybierz nastepna partycje", action {
- map.selected += 1;
- if (map.selected >= map.usable_cnt)
- map.selected = 0;
- };
+ map.selected += 1;
+ if (map.selected >= map.usable_cnt)
+ map.selected = 0;
+ };
option "Zmien wybrana partycje", sub menu chooseid;
option "Ustaw punkt montazu dla partycji", sub menu mount_point;
option "Podziel wybrana partycje", action {
- int i, j, k, size, free_size;
- char buf[40];
- EBZB *bzb;
-
- j = map.mblk[map.selected];
- msg_display(MSG_split_part, map.blk[j].pmPartBlkCnt);
- msg_prompt_add (MSG_scratch_size, NULL, buf, sizeof(buf));
- size = atoi(buf);
- if (size > 0 && size < map.blk[j].pmPartBlkCnt) {
- k = map.in_use_cnt+1;
- if (k <= map.size) {
- memcpy (&map.blk[k], &map.blk[j],
- sizeof(struct apple_part_map_entry));
- free_size = map.blk[j].pmPartBlkCnt - size;
- strcpy (map.blk[j].pmPartType, "Apple_Scratch");
- map.blk[j].pmPartBlkCnt = size;
- map.blk[j].pmDataCnt = size;
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- bzb->magic = 0;
- bzb->mount_point[0] = '\0';
- strcpy (map.blk[k].pmPartType, "Apple_Free");
- map.blk[k].pmPyPartStart += size;
- if ((map.blk[k].pmPyPartStart + free_size) > dlsize)
- map.blk[k].pmPartBlkCnt =
- dlsize - map.blk[k].pmPyPartStart;
+ int i, j, k, size, free_size;
+ char buf[40];
+ EBZB *bzb;
+
+ j = map.mblk[map.selected];
+ msg_display(MSG_split_part, map.blk[j].pmPartBlkCnt);
+ msg_prompt_add (MSG_scratch_size, NULL, buf, sizeof(buf));
+ size = atoi(buf);
+ if (size > 0 && size < map.blk[j].pmPartBlkCnt) {
+ k = map.in_use_cnt+1;
+ if (k <= map.size) {
+ memcpy (&map.blk[k], &map.blk[j],
+ sizeof(struct apple_part_map_entry));
+ free_size = map.blk[j].pmPartBlkCnt - size;
+ strcpy (map.blk[j].pmPartType, "Apple_Scratch");
+ map.blk[j].pmPartBlkCnt = size;
+ map.blk[j].pmDataCnt = size;
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ bzb->magic = 0;
+ bzb->mount_point[0] = '\0';
+ strcpy (map.blk[k].pmPartType, "Apple_Free");
+ map.blk[k].pmPyPartStart += size;
+ if ((map.blk[k].pmPyPartStart + free_size) > dlsize)
+ map.blk[k].pmPartBlkCnt =
+ dlsize - map.blk[k].pmPyPartStart;
else
- map.blk[k].pmPartBlkCnt = free_size;
- map.blk[k].pmDataCnt = map.blk[k].pmPartBlkCnt;
- bzb = (EBZB *)&map.blk[k].pmBootArgs[0];
- bzb->magic = 0;
- bzb->mount_point[0] = '\0';
- map.in_use_cnt += 1;
- sortmerge();
- } else {
- msg_display (MSG_diskfull);
- process_menu (MENU_okabort, NULL);
- if (!yesno) {
- free (map.blk);
- 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;i<map.size;i++)
- memcpy (&map.blk[i], &new_map[i],
- sizeof(struct apple_part_map_entry));
- map.blk[0].pmSigPad = 0; /* Don't rewrite Block0 */
+ map.blk[k].pmPartBlkCnt = free_size;
+ map.blk[k].pmDataCnt = map.blk[k].pmPartBlkCnt;
+ bzb = (EBZB *)&map.blk[k].pmBootArgs[0];
+ bzb->magic = 0;
+ bzb->mount_point[0] = '\0';
+ map.in_use_cnt += 1; /* Count new part as usable */
+ sortmerge();
+ } else {
+ msg_display (MSG_diskfull);
+ process_menu (MENU_okabort, NULL);
+ if (!yesno) {
+ free (map.blk);
+ 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;i<map.size;i++)
+ memcpy (&map.blk[i], &new_map[i],
+ sizeof(struct apple_part_map_entry));
+ map.blk[0].pmSigPad = 0; /* Don't rewrite Block0 */
}
- }
- } };
- option "Napraw wybrana partycje", 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 {
- msg_display_add(MSG_parttable_fix_fine,
- diskdev, bzb->flags.part);
- }
- process_menu(MENU_ok, NULL);
- };
+ }
+ } };
+ option "Napraw wybrana partycje", 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 {
+ msg_display_add(MSG_parttable_fix_fine,
+ diskdev, bzb->flags.part);
+ }
+ process_menu(MENU_ok, NULL);
+ };
menu ok2, title "Przerwac?", y=17;
@@ -163,170 +163,170 @@
menu chooseid, title "Rodzaj partycji?";
option "NetBSD Root", exit, action {
- int i, j;
- EBZB *bzb;
+ int i, j;
+ EBZB *bzb;
- j = map.mblk[map.selected];
- reset_part_flags(&map.blk[j]);
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- bzb->magic = APPLE_BZB_MAGIC;
- strcpy (map.blk[j].pmPartName, "NetBSD Root");
- strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2");
- bzb->type = APPLE_BZB_TYPEFS;
- bzb->flags.root = 1;
- /*
- * Automatically determine root mount points. The first
- * root-type filesystem is mounted on "/", all others
- * will mount on "/altroot". If there are multiple
- * occurances of "/altroot" they will be picked up on
- * the sanity_scan in the next step of the installation.
- */
- for (i=0,map.root_cnt=0;i<map.usable_cnt;i++) {
- j = map.mblk[i];
- 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)
- strcpy (bzb->mount_point, "/");
- else
- strcpy (bzb->mount_point, "/altroot");
- }
- }
- } };
+ j = map.mblk[map.selected];
+ reset_part_flags(&map.blk[j]);
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ bzb->magic = APPLE_BZB_MAGIC;
+ strcpy (map.blk[j].pmPartName, "NetBSD Root");
+ strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2");
+ bzb->type = APPLE_BZB_TYPEFS;
+ bzb->flags.root = 1;
+ /*
+ * Automatically determine root mount points. The first
+ * root-type filesystem is mounted on "/", all others
+ * will mount on "/altroot". If there are multiple
+ * occurances of "/altroot" they will be picked up on
+ * the sanity_scan in the next step of the installation.
+ */
+ for (i=0,map.root_cnt=0;i<map.usable_cnt;i++) {
+ j = map.mblk[i];
+ 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)
+ strcpy (bzb->mount_point, "/");
+ else
+ strcpy (bzb->mount_point, "/altroot");
+ }
+ }
+ } };
option "NetBSD SWAP", exit, action {
- int j;
- EBZB *bzb;
+ int j;
+ EBZB *bzb;
- j = map.mblk[map.selected];
- reset_part_flags(&map.blk[j]);
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- bzb->magic = APPLE_BZB_MAGIC;
- strcpy (map.blk[j].pmPartName, "NetBSD SWAP");
- strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2");
- bzb->type = APPLE_BZB_TYPESWAP; };
+ j = map.mblk[map.selected];
+ reset_part_flags(&map.blk[j]);
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ bzb->magic = APPLE_BZB_MAGIC;
+ strcpy (map.blk[j].pmPartName, "NetBSD SWAP");
+ strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2");
+ bzb->type = APPLE_BZB_TYPESWAP; };
option "NetBSD Usr", exit, action {
- int j;
- EBZB *bzb;
+ int j;
+ EBZB *bzb;
- j = map.mblk[map.selected];
- reset_part_flags(&map.blk[j]);
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- bzb->magic = APPLE_BZB_MAGIC;
- strcpy (map.blk[j].pmPartName, "NetBSD Usr");
- strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2");
- bzb->type = APPLE_BZB_TYPEFS;
- bzb->flags.usr = 1;
- if (map.usr_cnt++ == 0)
- strcpy (bzb->mount_point, "/usr");
- };
+ j = map.mblk[map.selected];
+ reset_part_flags(&map.blk[j]);
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ bzb->magic = APPLE_BZB_MAGIC;
+ strcpy (map.blk[j].pmPartName, "NetBSD Usr");
+ strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2");
+ bzb->type = APPLE_BZB_TYPEFS;
+ bzb->flags.usr = 1;
+ if (map.usr_cnt++ == 0)
+ strcpy (bzb->mount_point, "/usr");
+ };
option "NetBSD Root&Usr", exit, action {
- int j;
- EBZB *bzb;
+ int j;
+ EBZB *bzb;
- j = map.mblk[map.selected];
- reset_part_flags(&map.blk[j]);
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- bzb->magic = APPLE_BZB_MAGIC;
- strcpy (map.blk[j].pmPartName, "NetBSD Root & Usr");
- strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2");
- bzb->type = APPLE_BZB_TYPEFS;
- bzb->flags.root = 1;
- bzb->flags.usr = 1;
- if (map.root_cnt++ == 0)
- strcpy (bzb->mount_point, "/");
- else {
- if (map.usr_cnt++ == 0)
- strcpy (bzb->mount_point, "/usr");
- } };
+ j = map.mblk[map.selected];
+ reset_part_flags(&map.blk[j]);
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ bzb->magic = APPLE_BZB_MAGIC;
+ strcpy (map.blk[j].pmPartName, "NetBSD Root & Usr");
+ strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2");
+ bzb->type = APPLE_BZB_TYPEFS;
+ bzb->flags.root = 1;
+ bzb->flags.usr = 1;
+ if (map.root_cnt++ == 0)
+ strcpy (bzb->mount_point, "/");
+ else {
+ if (map.usr_cnt++ == 0)
+ strcpy (bzb->mount_point, "/usr");
+ } };
option "MacOS HFS", exit, action {
- int j;
- EBZB *bzb;
+ int j;
+ EBZB *bzb;
- j = map.mblk[map.selected];
- reset_part_flags(&map.blk[j]);
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- bzb->magic = 0;
- bzb->mount_point[0] = '\0';
- strcpy (map.blk[j].pmPartName, "untitled (HFS)");
- strcpy (map.blk[j].pmPartType, "Apple_HFS"); };
+ j = map.mblk[map.selected];
+ reset_part_flags(&map.blk[j]);
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ bzb->magic = 0;
+ bzb->mount_point[0] = '\0';
+ strcpy (map.blk[j].pmPartName, "untitled (HFS)");
+ strcpy (map.blk[j].pmPartType, "Apple_HFS"); };
option "Scratch", exit, action {
- int j;
- EBZB *bzb;
+ int j;
+ EBZB *bzb;
- j = map.mblk[map.selected];
- reset_part_flags(&map.blk[j]);
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- bzb->magic = 0;
- bzb->mount_point[0] = '\0';
- strcpy (map.blk[j].pmPartName, "untitled (Scratch)");
- strcpy (map.blk[j].pmPartType, "Apple_Scratch"); };
+ j = map.mblk[map.selected];
+ reset_part_flags(&map.blk[j]);
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ bzb->magic = 0;
+ bzb->mount_point[0] = '\0';
+ strcpy (map.blk[j].pmPartName, "untitled (Scratch)");
+ strcpy (map.blk[j].pmPartType, "Apple_Scratch"); };
option "Free", exit, action {
- int j;
- EBZB *bzb;
+ int j;
+ EBZB *bzb;
- j = map.mblk[map.selected];
- reset_part_flags(&map.blk[j]);
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- bzb->magic = 0;
- bzb->mount_point[0] = '\0';
- strcpy (map.blk[j].pmPartName, "untitled (Free)");
- strcpy (map.blk[j].pmPartType, "Apple_Free"); };
+ j = map.mblk[map.selected];
+ reset_part_flags(&map.blk[j]);
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ bzb->magic = 0;
+ bzb->mount_point[0] = '\0';
+ strcpy (map.blk[j].pmPartName, "untitled (Free)");
+ strcpy (map.blk[j].pmPartType, "Apple_Free"); };
menu mount_point, title "Punkt montazu?";
option "/usr", exit, action {
- int j;
- EBZB *bzb;
+ int j;
+ EBZB *bzb;
- j = map.mblk[map.selected];
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- strcpy (bzb->mount_point, "/usr"); };
+ j = map.mblk[map.selected];
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ strcpy (bzb->mount_point, "/usr"); };
option "/home", exit, action {
- int j;
- EBZB *bzb;
+ int j;
+ EBZB *bzb;
- j = map.mblk[map.selected];
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- strcpy (bzb->mount_point, "/home"); };
+ j = map.mblk[map.selected];
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ strcpy (bzb->mount_point, "/home"); };
option "/var", exit, action {
- int j;
- EBZB *bzb;
+ int j;
+ EBZB *bzb;
- j = map.mblk[map.selected];
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- strcpy (bzb->mount_point, "/var"); };
+ j = map.mblk[map.selected];
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ strcpy (bzb->mount_point, "/var"); };
option "/tmp", exit, action {
- int j;
- EBZB *bzb;
+ int j;
+ EBZB *bzb;
- j = map.mblk[map.selected];
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- strcpy (bzb->mount_point, "/tmp"); };
+ j = map.mblk[map.selected];
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ strcpy (bzb->mount_point, "/tmp"); };
option "Zaden", exit, action {
- int j;
- EBZB *bzb;
+ int j;
+ EBZB *bzb;
- j = map.mblk[map.selected];
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- bzb->mount_point[0] = '\0'; };
+ j = map.mblk[map.selected];
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ bzb->mount_point[0] = '\0'; };
option "inny", exit, action {
- int j;
- char buf[60];
- EBZB *bzb;
-
- msg_display (MSG_custom_mount_point);
- msg_prompt_add (MSG_mountpoint, NULL, buf, sizeof(buf));
- j = map.mblk[map.selected];
- bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- if (buf[0] != '\0') {
- bzb->mount_point[0] = '\0';
- if (buf[0] != '/')
- strcpy (bzb->mount_point, "/");
- strcat(bzb->mount_point, buf);
- } };
+ int j;
+ char buf[60];
+ EBZB *bzb;
+
+ msg_display (MSG_custom_mount_point);
+ msg_prompt_add (MSG_mountpoint, NULL, buf, sizeof(buf));
+ j = map.mblk[map.selected];
+ bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
+ if (buf[0] != '\0') {
+ bzb->mount_point[0] = '\0';
+ if (buf[0] != '/')
+ strcpy (bzb->mount_point, "/");
+ strcat(bzb->mount_point, buf);
+ } };
menu sanity, title "Wybierz opcje";
display action {msg_display (MSG_sanity_check);
- report_errors(); };
+ report_errors(); };
option "Przerwij instalacje", exit, action {yesno = -1; };
option "Zignoruj ostrzezenia i kontynuuj", exit, action {yesno = 1;};
option "Ponownie wyedytuj mape partycji dysku", exit, action {yesno = 0; };
@@ -335,4 +335,3 @@
* This menu shouldn't be used in the mac68k port, but it needs to be
* defined because it's referenced from the toplevel code.
*/
-
