Changeset f57ccb5 in mainline for uspace/lib/fdisk/src/fdisk.c

Timestamp:

2015-08-11T16:03:59Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0bde8523

Parents:

1b23e33

Message:

Set partition type based on selected filesystem type.

File:

• uspace/lib/fdisk/src/fdisk.c (modified) (4 diffs)

uspace/lib/fdisk/src/fdisk.c

@@ -912 +912 @@
         aoff64_t fnblocks;
         uint64_t block_size;
+        label_pcnt_t pcnt;
         unsigned i;
         int index;
@@ -932 +933 @@
         req_blocks = fdisk_ba_align_up(dev, req_blocks);
 
+        pcnt = -1;
+
+        switch (pspec->fstype) {
+        case fdfs_none:
+        case fdfs_unknown:
+                break;
+        case fdfs_exfat:
+                pcnt = lpc_exfat;
+                break;
+        case fdfs_fat:
+                pcnt = lpc_fat32; /* XXX Detect FAT12/16 vs FAT32 */
+                break;
+        case fdfs_minix:
+                pcnt = lpc_minix;
+                break;
+        case fdfs_ext4:
+                pcnt = lpc_ext4;
+                break;
+        }
+
+        if (pcnt < 0)
+                return EINVAL;
+
         printf("fdisk_part_spec_prepare() - switch\n");
         switch (pspec->pkind) {
@@ -952 +976 @@
                 vpspec->nblocks = req_blocks;
                 vpspec->pkind = pspec->pkind;
-                if (pspec->pkind != lpk_extended)
-                        vpspec->ptype = 42;
                 break;
         case lpk_logical:
@@ -967 +989 @@
                 vpspec->nblocks = req_blocks;
                 vpspec->pkind = lpk_logical;
-                vpspec->ptype = 42;
-                break;
+                vpspec->ptype.fmt = lptf_num;
+                vpspec->ptype.t.num = 42;
+                break;
+        }
+
+        if (pspec->pkind != lpk_extended) {
+                rc = vbd_suggest_ptype(dev->fdisk->vbd, dev->sid, pcnt,
+                    &vpspec->ptype);
+                if (rc != EOK)
+                        return EIO;
         }