From f637cc663949bccca990f7e53862f9c0aca11ea2 Mon Sep 17 00:00:00 2001 From: marcel Date: Sun, 2 Nov 2003 08:39:08 +0000 Subject: o Move Int_Open_Disk() from disk.c to open_disk.c for use by all platforms except ia64 and use Int_Open_Disk() in open_ia64_disk.c on ia64. We need to know more than GEOM can provide us so we're forced to read from the disk. Move uuid_type() to open_ia64_disk.c and remove all references on non-ia64. o Pass the GEOM conftxt to Int_Open_Disk() so that only Open_Disk() needs to know about GEOM and libdisk can more easily be used with media not handled by GEOM. o Create an ia64 specific definiton of struct disk on ia64, because we don't need/have most of the fields other platforms need and other fields not applicable on platforms other than ia64. o Do not compile change.c on ia64. It's too PC specific. o In Fixup_Names() in create_chunk.c, try all partition numbers that are valid for the GPT disk. We have the total number of partitions that can be allocated in the disk structure on ia64. Also, use the GPT partition naming if we're creating one under a chunk of type "whole". It's a GPT partition in that case. o In Create_Chunk(), compile-out the PC specific code on ia64 that checks BIOS geometry restrictions. o In Debug_Disk() in disk.c, dump the ia64 specific fields. o Save the partition index in the chunk on ia64 so that we can preserve it when we write the data back to disk. This avoids that partitions get moved around or swapped after installing FreeBSD, which may render a disk unusable. --- lib/libdisk/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'lib/libdisk/Makefile') diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile index f3c560b..762c904 100644 --- a/lib/libdisk/Makefile +++ b/lib/libdisk/Makefile @@ -1,8 +1,15 @@ # $FreeBSD$ +.if ${MACHINE_ARCH} == "ia64" +_open_disk= open_ia64_disk.c +.else +_change = change.c +_open_disk= open_disk.c +.endif + LIB= disk -SRCS= blocks.c chunk.c disk.c change.c \ - create_chunk.c rules.c write_disk.c write_${MACHINE}_disk.c +SRCS= blocks.c ${_change} chunk.c create_chunk.c disk.c ${_open_disk} \ + rules.c write_disk.c write_${MACHINE}_disk.c INCS= libdisk.h WARNS= 2 -- cgit v1.1