From 80910f03a69a2e4ed250e0cf4160efc400ec14da Mon Sep 17 00:00:00 2001 From: jkh Date: Wed, 30 Sep 1998 21:55:33 +0000 Subject: [PATCH] Add another check to prevent user from hanging themselves on alpha. --- release/sysinstall/disks.c | 7 ++++++- usr.sbin/sade/disks.c | 7 ++++++- usr.sbin/sysinstall/disks.c | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c index 64d8f6a01e2d..9222a39aaa2e 100644 --- a/release/sysinstall/disks.c +++ b/release/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.100 1998/09/15 10:24:46 gibbs Exp $ + * $Id: disks.c,v 1.101 1998/09/30 21:48:11 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -336,6 +336,11 @@ diskPartition(Device *dev) partitiontype = fat; else partitiontype = unknown; +#ifdef __alpha__ + if (partitiontype == freebsd && size == chunk_info[current_chunk]->size) + All_FreeBSD(d, 1); + else +#endif Create_Chunk(d, chunk_info[current_chunk]->offset, size, partitiontype, subtype, (chunk_info[current_chunk]->flags & CHUNK_ALIGN)); variable_set2(DISK_PARTITIONED, "yes"); diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index 64d8f6a01e2d..9222a39aaa2e 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.100 1998/09/15 10:24:46 gibbs Exp $ + * $Id: disks.c,v 1.101 1998/09/30 21:48:11 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -336,6 +336,11 @@ diskPartition(Device *dev) partitiontype = fat; else partitiontype = unknown; +#ifdef __alpha__ + if (partitiontype == freebsd && size == chunk_info[current_chunk]->size) + All_FreeBSD(d, 1); + else +#endif Create_Chunk(d, chunk_info[current_chunk]->offset, size, partitiontype, subtype, (chunk_info[current_chunk]->flags & CHUNK_ALIGN)); variable_set2(DISK_PARTITIONED, "yes"); diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 64d8f6a01e2d..9222a39aaa2e 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.100 1998/09/15 10:24:46 gibbs Exp $ + * $Id: disks.c,v 1.101 1998/09/30 21:48:11 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -336,6 +336,11 @@ diskPartition(Device *dev) partitiontype = fat; else partitiontype = unknown; +#ifdef __alpha__ + if (partitiontype == freebsd && size == chunk_info[current_chunk]->size) + All_FreeBSD(d, 1); + else +#endif Create_Chunk(d, chunk_info[current_chunk]->offset, size, partitiontype, subtype, (chunk_info[current_chunk]->flags & CHUNK_ALIGN)); variable_set2(DISK_PARTITIONED, "yes");