hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-23 01:14:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

In checkLabels(), deal with the fact that on ia64 we do not have a

Browse Source 
disklabel.
This commit is contained in:
Marcel Moolenaar 2004-01-30 05:21:32 +00:00
parent 3a0bfa76fd
commit 04b01085a5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=125223
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/sade/install.c
View File

@ -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
}
}

12
usr.sbin/sysinstall/install.c
View File

@ -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
}
}