d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes for ia64 installs:

Browse Source 
- Don't look for partitions inside a FreeBSD chunk on ia64 when mounting
  the filesystems just before the chroot and install.
- Write entries out to /etc/fstab for filesystems that aren't inside a
  FreeBSD chunk, but are a top-level chunk under the disk.
This commit is contained in:
John Baldwin 2004-05-07 19:15:56 +00:00
parent b60cb13f76
commit 1cbf549da4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=129041
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/sade/config.c
View File

@ -212,7 +212,8 @@ configFstab(dialogMenuItem *self)
chunk_list[nchunks++] = c2;
}
}
else if ((c1->type == fat || c1->type == efi) && c1->private_data)
else if (((c1->type == fat || c1->type == efi || c1->type == part) &&
c1->private_data) || (c1->type == part && c1->subtype == FS_SWAP))
chunk_list[nchunks++] = c1;
}
}

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

@ -1036,8 +1036,14 @@ installFilesystems(dialogMenuItem *self)
return DITEM_FAILURE | DITEM_RESTORE;
}
for (c1 = disk->chunks->part; c1; c1 = c1->next) {
#ifndef __ia64__
if (c1->type == freebsd) {
for (c2 = c1->part; c2; c2 = c2->next) {
#else
if (c1->type == part) {
c2 = c1;
{
#endif
if (c2->type == part && c2->subtype != FS_SWAP && c2->private_data) {
PartInfo *tmp = (PartInfo *)c2->private_data;

3
usr.sbin/sysinstall/config.c
View File

@ -212,7 +212,8 @@ configFstab(dialogMenuItem *self)
chunk_list[nchunks++] = c2;
}
}
else if ((c1->type == fat || c1->type == efi) && c1->private_data)
else if (((c1->type == fat || c1->type == efi || c1->type == part) &&
c1->private_data) || (c1->type == part && c1->subtype == FS_SWAP))
chunk_list[nchunks++] = c1;
}
}

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

@ -1036,8 +1036,14 @@ installFilesystems(dialogMenuItem *self)
return DITEM_FAILURE | DITEM_RESTORE;
}
for (c1 = disk->chunks->part; c1; c1 = c1->next) {
#ifndef __ia64__
if (c1->type == freebsd) {
for (c2 = c1->part; c2; c2 = c2->next) {
#else
if (c1->type == part) {
c2 = c1;
{
#endif
if (c2->type == part && c2->subtype != FS_SWAP && c2->private_data) {
PartInfo *tmp = (PartInfo *)c2->private_data;