diff options
author | marcel <marcel@FreeBSD.org> | 2004-01-30 05:21:32 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2004-01-30 05:21:32 +0000 |
commit | 23743eed6fa996cfc4be5b3ab36ae4d1f966b311 (patch) | |
tree | b8c283a40058b3aa7f877664c1f88f0b7f14eed3 | |
parent | da4e5dcea735da874c8681435682433e44a69c74 (diff) | |
download | FreeBSD-src-23743eed6fa996cfc4be5b3ab36ae4d1f966b311.zip FreeBSD-src-23743eed6fa996cfc4be5b3ab36ae4d1f966b311.tar.gz |
In checkLabels(), deal with the fact that on ia64 we do not have a
disklabel.
-rw-r--r-- | usr.sbin/sade/install.c | 12 | ||||
-rw-r--r-- | usr.sbin/sysinstall/install.c | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index f2c5318..49f6ed4 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -109,8 +109,12 @@ checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vd if (!disk->chunks) msgFatal("No chunk list found for %s!", disk->name); for (c1 = disk->chunks->part; c1; c1 = c1->next) { +#ifndef __ia64__ if (c1->type == freebsd) { for (c2 = c1->part; c2; c2 = c2->next) { +#else + c2 = c1; +#endif if (c2->type == part && c2->subtype != FS_SWAP && c2->private_data) { if (!strcmp(((PartInfo *)c2->private_data)->mountpoint, "/")) { if (rootdev) { @@ -176,8 +180,10 @@ checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vd } } } +#ifndef __ia64__ } } +#endif } } @@ -190,16 +196,22 @@ checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vd if (!disk->chunks) msgFatal("No chunk list found for %s!", disk->name); for (c1 = disk->chunks->part; c1; c1 = c1->next) { +#ifndef __ia64__ if (c1->type == freebsd) { for (c2 = c1->part; c2; c2 = c2->next) { +#else + c2 = c1; +#endif if (c2->type == part && c2->subtype == FS_SWAP && !swapdev) { swapdev = c2; if (isDebug()) msgDebug("Found swapdev at %s!\n", swapdev->name); break; } +#ifndef __ia64__ } } +#endif } } diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index f2c5318..49f6ed4 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -109,8 +109,12 @@ checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vd if (!disk->chunks) msgFatal("No chunk list found for %s!", disk->name); for (c1 = disk->chunks->part; c1; c1 = c1->next) { +#ifndef __ia64__ if (c1->type == freebsd) { for (c2 = c1->part; c2; c2 = c2->next) { +#else + c2 = c1; +#endif if (c2->type == part && c2->subtype != FS_SWAP && c2->private_data) { if (!strcmp(((PartInfo *)c2->private_data)->mountpoint, "/")) { if (rootdev) { @@ -176,8 +180,10 @@ checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vd } } } +#ifndef __ia64__ } } +#endif } } @@ -190,16 +196,22 @@ checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vd if (!disk->chunks) msgFatal("No chunk list found for %s!", disk->name); for (c1 = disk->chunks->part; c1; c1 = c1->next) { +#ifndef __ia64__ if (c1->type == freebsd) { for (c2 = c1->part; c2; c2 = c2->next) { +#else + c2 = c1; +#endif if (c2->type == part && c2->subtype == FS_SWAP && !swapdev) { swapdev = c2; if (isDebug()) msgDebug("Found swapdev at %s!\n", swapdev->name); break; } +#ifndef __ia64__ } } +#endif } } |