diff options
author | marcel <marcel@FreeBSD.org> | 2002-11-13 05:39:59 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2002-11-13 05:39:59 +0000 |
commit | f76e12575fa9a5cbc6ed3efd9dd9c108757bae56 (patch) | |
tree | db653a4aea5ccbee784fe449b0930df930899cd0 /usr.sbin/sysinstall | |
parent | c02d224c79a209121012072dc916c2d61ce8c1e5 (diff) | |
download | FreeBSD-src-f76e12575fa9a5cbc6ed3efd9dd9c108757bae56.zip FreeBSD-src-f76e12575fa9a5cbc6ed3efd9dd9c108757bae56.tar.gz |
Also test for type efi everywhere we currently test for type fat.
With this change there's no a priori difference between EFI and
FAT partitions. With this change and the corresponding change to
libdisk, we can create EFI partitions, just like regular FAT
partitions.
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r-- | usr.sbin/sysinstall/config.c | 9 | ||||
-rw-r--r-- | usr.sbin/sysinstall/devices.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/disks.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/install.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/label.c | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 167927a..6536de7 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 c9038db..e675ae1 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 4122b70..c97e155 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 52fe118..52cc632 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 a52ea63..62f0024 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; |