aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>2002-11-13 05:39:59 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>2002-11-13 05:39:59 +0000
commitdf81b3e662b3e38ddb7679174438c5c5b05407eb (patch)
treedb653a4aea5ccbee784fe449b0930df930899cd0
parenteea85e9bb62e3b613103466055df9de9d0445ee9 (diff)
Notes
Diffstat
-rw-r--r--usr.sbin/sade/config.c9
-rw-r--r--usr.sbin/sade/devices.c2
-rw-r--r--usr.sbin/sade/disks.c2
-rw-r--r--usr.sbin/sade/install.c2
-rw-r--r--usr.sbin/sade/label.c2
-rw-r--r--usr.sbin/sysinstall/config.c9
-rw-r--r--usr.sbin/sysinstall/devices.c2
-rw-r--r--usr.sbin/sysinstall/disks.c2
-rw-r--r--usr.sbin/sysinstall/install.c2
-rw-r--r--usr.sbin/sysinstall/label.c2
10 files changed, 22 insertions, 12 deletions
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 167927a9f826..6536de70f4d2 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -113,7 +113,7 @@ mount_point(Chunk *c1)
{
if (c1->type == part && c1->subtype == FS_SWAP)
return "none";
- else if (c1->type == part || c1->type == fat)
+ else if (c1->type == part || c1->type == fat || c1->type == efi)
return ((PartInfo *)c1->private_data)->mountpoint;
return "/bogus";
}
@@ -121,7 +121,7 @@ mount_point(Chunk *c1)
static char *
fstype(Chunk *c1)
{
- if (c1->type == fat)
+ if (c1->type == fat || c1->type == efi)
return "msdosfs";
else if (c1->type == part) {
if (c1->subtype != FS_SWAP)
@@ -151,6 +151,9 @@ fstype_short(Chunk *c1)
else
return "ro";
}
+ else if (c1->type == efi)
+ return "rw";
+
return "bog";
}
@@ -208,7 +211,7 @@ configFstab(dialogMenuItem *self)
chunk_list[nchunks++] = c2;
}
}
- else if (c1->type == fat && c1->private_data)
+ else if ((c1->type == fat || c1->type == efi) && c1->private_data)
chunk_list[nchunks++] = c1;
}
}
diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c
index c9038dbcd4eb..e675ae109c21 100644
--- a/usr.sbin/sade/devices.c
+++ b/usr.sbin/sade/devices.c
@@ -460,7 +460,7 @@ skipif:
/* Look for existing DOS partitions to register as "DOS media devices" */
for (c1 = d->chunks->part; c1; c1 = c1->next) {
- if (c1->type == fat || c1->type == extended) {
+ if (c1->type == fat || c1->type == efi || c1->type == extended) {
Device *dev;
char devname[80];
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index 4122b70559dc..c97e1557c859 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/disks.c
@@ -508,6 +508,8 @@ diskPartition(Device *dev)
partitiontype = freebsd;
else if (subtype == SUBTYPE_FAT)
partitiontype = fat;
+ else if (subtype == SUBTYPE_EFI)
+ partitiontype = efi;
else
partitiontype = unknown;
chunk_info[current_chunk]->type = partitiontype;
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 52fe1180d961..52cc63246abe 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -1038,7 +1038,7 @@ installFilesystems(dialogMenuItem *self)
}
}
}
- else if (c1->type == fat && c1->private_data && (root->newfs || upgrade)) {
+ else if ((c1->type == fat || c1->type == efi) && c1->private_data && (root->newfs || upgrade)) {
char name[FILENAME_MAX];
sprintf(name, "%s/%s", RunningAsInit ? "/mnt" : "", ((PartInfo *)c1->private_data)->mountpoint);
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index a52ea63fc2d8..62f0024d4019 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -305,7 +305,7 @@ record_label_chunks(Device **devs, Device *dev)
}
}
}
- else if (c1->type == fat) {
+ else if (c1->type == fat || c1->type == efi) {
label_chunk_info[j].type = PART_FAT;
label_chunk_info[j].c = c1;
++j;
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 167927a9f826..6536de70f4d2 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -113,7 +113,7 @@ mount_point(Chunk *c1)
{
if (c1->type == part && c1->subtype == FS_SWAP)
return "none";
- else if (c1->type == part || c1->type == fat)
+ else if (c1->type == part || c1->type == fat || c1->type == efi)
return ((PartInfo *)c1->private_data)->mountpoint;
return "/bogus";
}
@@ -121,7 +121,7 @@ mount_point(Chunk *c1)
static char *
fstype(Chunk *c1)
{
- if (c1->type == fat)
+ if (c1->type == fat || c1->type == efi)
return "msdosfs";
else if (c1->type == part) {
if (c1->subtype != FS_SWAP)
@@ -151,6 +151,9 @@ fstype_short(Chunk *c1)
else
return "ro";
}
+ else if (c1->type == efi)
+ return "rw";
+
return "bog";
}
@@ -208,7 +211,7 @@ configFstab(dialogMenuItem *self)
chunk_list[nchunks++] = c2;
}
}
- else if (c1->type == fat && c1->private_data)
+ else if ((c1->type == fat || c1->type == efi) && c1->private_data)
chunk_list[nchunks++] = c1;
}
}
diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c
index c9038dbcd4eb..e675ae109c21 100644
--- a/usr.sbin/sysinstall/devices.c
+++ b/usr.sbin/sysinstall/devices.c
@@ -460,7 +460,7 @@ skipif:
/* Look for existing DOS partitions to register as "DOS media devices" */
for (c1 = d->chunks->part; c1; c1 = c1->next) {
- if (c1->type == fat || c1->type == extended) {
+ if (c1->type == fat || c1->type == efi || c1->type == extended) {
Device *dev;
char devname[80];
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index 4122b70559dc..c97e1557c859 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -508,6 +508,8 @@ diskPartition(Device *dev)
partitiontype = freebsd;
else if (subtype == SUBTYPE_FAT)
partitiontype = fat;
+ else if (subtype == SUBTYPE_EFI)
+ partitiontype = efi;
else
partitiontype = unknown;
chunk_info[current_chunk]->type = partitiontype;
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 52fe1180d961..52cc63246abe 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -1038,7 +1038,7 @@ installFilesystems(dialogMenuItem *self)
}
}
}
- else if (c1->type == fat && c1->private_data && (root->newfs || upgrade)) {
+ else if ((c1->type == fat || c1->type == efi) && c1->private_data && (root->newfs || upgrade)) {
char name[FILENAME_MAX];
sprintf(name, "%s/%s", RunningAsInit ? "/mnt" : "", ((PartInfo *)c1->private_data)->mountpoint);
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index a52ea63fc2d8..62f0024d4019 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -305,7 +305,7 @@ record_label_chunks(Device **devs, Device *dev)
}
}
}
- else if (c1->type == fat) {
+ else if (c1->type == fat || c1->type == efi) {
label_chunk_info[j].type = PART_FAT;
label_chunk_info[j].c = c1;
++j;
generated by cgit v1.3 (git 2.53.0) at 2026-07-30 21:25:26 +0000