From 848b0d85828e4a0ff0b77458d23618041ae0d914 Mon Sep 17 00:00:00 2001 From: christos Date: Sat, 11 Jan 2003 19:31:52 +0000 Subject: [PATCH] use the names. --- distrib/utils/sysinst/arch/mac68k/menus.md.en | 34 +++++++++---------- distrib/utils/sysinst/arch/mac68k/menus.md.pl | 34 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/distrib/utils/sysinst/arch/mac68k/menus.md.en b/distrib/utils/sysinst/arch/mac68k/menus.md.en index e9e7c584efdd..f467e9e9a1ae 100644 --- a/distrib/utils/sysinst/arch/mac68k/menus.md.en +++ b/distrib/utils/sysinst/arch/mac68k/menus.md.en @@ -1,4 +1,4 @@ -/* $NetBSD: menus.md.en,v 1.15 2002/10/20 22:06:17 rnestor Exp $ */ +/* $NetBSD: menus.md.en,v 1.16 2003/01/11 19:31:52 christos Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -59,11 +59,11 @@ menu nodiskmap, title "Choose an option", y=16; } map.size = NEW_MAP_SIZE; map.in_use_cnt = new_map[0].pmMapBlkCnt; - map.blk = (struct part_map_entry *)calloc(map.size, - sizeof(struct part_map_entry)); + map.blk = (struct apple_part_map_entry *)calloc(map.size, + sizeof(struct apple_part_map_entry)); for (i=0;imagic = BZB_MAGIC; + bzb->magic = APPLE_BZB_MAGIC; strcpy (map.blk[j].pmPartName, "NetBSD Root"); strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2"); - bzb->type = BZB_TYPEFS; + bzb->type = APPLE_BZB_TYPEFS; bzb->flags.root = 1; /* * Automatically determine root mount points. The first @@ -183,7 +183,7 @@ menu chooseid, title "Partition Type?"; j = map.mblk[i]; if (whichType(&map.blk[j]) == ROOT_PART) { bzb = (EBZB *)&map.blk[j].pmBootArgs[0]; - if (bzb->type == BZB_TYPEFS && bzb->flags.root) { + if (bzb->type == APPLE_BZB_TYPEFS && bzb->flags.root) { if (map.root_cnt++ == 0) strcpy (bzb->mount_point, "/"); else @@ -198,10 +198,10 @@ menu chooseid, title "Partition Type?"; j = map.mblk[map.selected]; reset_part_flags(&map.blk[j]); bzb = (EBZB *)&map.blk[j].pmBootArgs[0]; - bzb->magic = BZB_MAGIC; + bzb->magic = APPLE_BZB_MAGIC; strcpy (map.blk[j].pmPartName, "NetBSD SWAP"); strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2"); - bzb->type = BZB_TYPESWAP; }; + bzb->type = APPLE_BZB_TYPESWAP; }; option "NetBSD Usr", exit, action { int j; EBZB *bzb; @@ -209,10 +209,10 @@ menu chooseid, title "Partition Type?"; j = map.mblk[map.selected]; reset_part_flags(&map.blk[j]); bzb = (EBZB *)&map.blk[j].pmBootArgs[0]; - bzb->magic = BZB_MAGIC; + bzb->magic = APPLE_BZB_MAGIC; strcpy (map.blk[j].pmPartName, "NetBSD Usr"); strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2"); - bzb->type = BZB_TYPEFS; + bzb->type = APPLE_BZB_TYPEFS; bzb->flags.usr = 1; if (map.usr_cnt++ == 0) strcpy (bzb->mount_point, "/usr"); @@ -224,10 +224,10 @@ menu chooseid, title "Partition Type?"; j = map.mblk[map.selected]; reset_part_flags(&map.blk[j]); bzb = (EBZB *)&map.blk[j].pmBootArgs[0]; - bzb->magic = BZB_MAGIC; + bzb->magic = APPLE_BZB_MAGIC; strcpy (map.blk[j].pmPartName, "NetBSD Root & Usr"); strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2"); - bzb->type = BZB_TYPEFS; + bzb->type = APPLE_BZB_TYPEFS; bzb->flags.root = 1; bzb->flags.usr = 1; if (map.root_cnt++ == 0) diff --git a/distrib/utils/sysinst/arch/mac68k/menus.md.pl b/distrib/utils/sysinst/arch/mac68k/menus.md.pl index 5dda21859bd2..76855159d262 100644 --- a/distrib/utils/sysinst/arch/mac68k/menus.md.pl +++ b/distrib/utils/sysinst/arch/mac68k/menus.md.pl @@ -1,4 +1,4 @@ -/* $NetBSD: menus.md.pl,v 1.3 2002/10/20 22:06:17 rnestor Exp $ */ +/* $NetBSD: menus.md.pl,v 1.4 2003/01/11 19:31:52 christos Exp $ */ /* Based on english version: */ /* NetBSD: menus.md.en,v 1.13 2001/11/29 23:20:58 thorpej Exp */ @@ -61,11 +61,11 @@ menu nodiskmap, title "Wybierz opcje", y=16; } map.size = NEW_MAP_SIZE; map.in_use_cnt = new_map[0].pmMapBlkCnt; - map.blk = (struct part_map_entry *)calloc(map.size, - sizeof(struct part_map_entry)); + map.blk = (struct apple_part_map_entry *)calloc(map.size, + sizeof(struct apple_part_map_entry)); for (i=0;imagic = BZB_MAGIC; + bzb->magic = APPLE_BZB_MAGIC; strcpy (map.blk[j].pmPartName, "NetBSD Root"); strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2"); - bzb->type = BZB_TYPEFS; + bzb->type = APPLE_BZB_TYPEFS; bzb->flags.root = 1; /* * Automatically determine root mount points. The first @@ -177,7 +177,7 @@ menu chooseid, title "Rodzaj partycji?"; j = map.mblk[i]; if (part_type(j, fstyp, use, name) == TYP_BSD) { bzb = (EBZB *)&map.blk[j].pmBootArgs[0]; - if (bzb->type == BZB_TYPEFS && bzb->flags.root) { + if (bzb->type == APPLE_BZB_TYPEFS && bzb->flags.root) { if (map.root_cnt++ == 0) strcpy (bzb->mount_point, "/"); else @@ -192,10 +192,10 @@ menu chooseid, title "Rodzaj partycji?"; j = map.mblk[map.selected]; reset_part_flags(j); bzb = (EBZB *)&map.blk[j].pmBootArgs[0]; - bzb->magic = BZB_MAGIC; + bzb->magic = APPLE_BZB_MAGIC; strcpy (map,blk[j].pmPartName, "NetBSD SWAP"); strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2"); - bzb->type = BZB_TYPESWAP; }; + bzb->type = APPLE_BZB_TYPESWAP; }; option "NetBSD Usr", exit, action { int j; EBZB *bzb; @@ -203,10 +203,10 @@ menu chooseid, title "Rodzaj partycji?"; j = map.mblk[map.selected]; reset_part_flags(j); bzb = (EBZB *)&map.blk[j].pmBootArgs[0]; - bzb->magic = BZB_MAGIC; + bzb->magic = APPLE_BZB_MAGIC; strcpy (map.blk[j].pmPartName, "NetBSD Usr"); strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2"); - bzb->type = BZB_TYPEFS; + bzb->type = APPLE_BZB_TYPEFS; bzb->flags.usr = 1; if (!map.usr_cnt) strcpy (bzb->mount_point, "/usr"); @@ -218,10 +218,10 @@ menu chooseid, title "Rodzaj partycji?"; j = map.mblk[map.selected]; reset_part_flags(j); bzb = (EBZB *)&map.blk[j].pmBootArgs[0]; - bzb->magic = BZB_MAGIC; + bzb->magic = APPLE_BZB_MAGIC; strcpy (map.blk[j].pmPartName, "NetBSD Root & Usr"); strcpy (map.blk[j].pmPartType, "Apple_Unix_SVR2"); - bzb->type = BZB_TYPEFS; + bzb->type = APPLE_BZB_TYPEFS; bzb->flags.root = 1; bzb->flags.usr = 1; if (!map.root_cnt)