Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:ALP:Source:Standard:Core:0.1
parted
direct-handling-of-partition-type-id-and-uuid.p...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File direct-handling-of-partition-type-id-and-uuid.patch of Package parted
From 1d798715b5998cd4afd184beb88ebdbe1a2642e8 Mon Sep 17 00:00:00 2001 From: Arvin Schnell <aschnell@suse.de> Date: Thu, 14 Oct 2021 16:29:06 +0200 Subject: [PATCH] allow direct handling of partition type id and uuid --- include/parted/disk.in.h | 23 +++++- libparted/disk.c | 86 ++++++++++++++++++++++ libparted/labels/dasd.c | 4 ++ libparted/labels/dos.c | 30 +++++++- libparted/labels/gpt.c | 40 ++++++++++- parted/parted.c | 146 +++++++++++++++++++++++++++++++++++++- tests/t0800-json-gpt.sh | 2 + tests/t0801-json-msdos.sh | 5 +- 8 files changed, 329 insertions(+), 7 deletions(-) diff --git a/include/parted/disk.in.h b/include/parted/disk.in.h index 303f59c..d7fde12 100644 --- a/include/parted/disk.in.h +++ b/include/parted/disk.in.h @@ -32,6 +32,7 @@ */ #include <stdlib.h> #include <unistd.h> +#include <stdint.h> /** * Disk flags @@ -91,9 +92,11 @@ enum _PedPartitionFlag { PED_DISK_TYPE_EXTENDED=1, /**< supports extended partitions */ PED_DISK_TYPE_PARTITION_NAME=2, /**< supports partition names */ - PED_DISK_TYPE_SYSTEM_NAME=4 /**< supports system names */ + PED_DISK_TYPE_SYSTEM_NAME=4, /**< supports system names */ + PED_DISK_TYPE_PARTITION_TYPE_ID=8, /**< supports partition type-ids */ + PED_DISK_TYPE_PARTITION_TYPE_UUID=16, /**< supports partition type-uuids */ }; #define PED_DISK_TYPE_FIRST_FEATURE PED_DISK_TYPE_EXTENDED -#define PED_DISK_TYPE_LAST_FEATURE PED_DISK_TYPE_SYSTEM_NAME +#define PED_DISK_TYPE_LAST_FEATURE PED_DISK_TYPE_PARTITION_TYPE_UUID struct _PedDisk; struct _PedPartition; @@ -247,6 +250,13 @@ struct _PedDiskOps { PedPartitionFlag flag); void (*partition_set_name) (PedPartition* part, const char* name); const char* (*partition_get_name) (const PedPartition* part); + + int (*partition_set_type_id) (PedPartition* part, uint8_t id); + uint8_t (*partition_get_type_id) (const PedPartition* part); + + int (*partition_set_type_uuid) (PedPartition* part, const uint8_t* uuid); + uint8_t* (*partition_get_type_uuid) (const PedPartition* part); + int (*partition_align) (PedPartition* part, const PedConstraint* constraint); int (*partition_enumerate) (PedPartition* part); @@ -347,6 +357,10 @@ extern int ped_partition_set_system (PedPartition* part, extern int ped_partition_set_system_name (PedPartition* part, const char* name); extern const char* ped_partition_get_name (const PedPartition* part); extern const char* ped_partition_get_system_name (const PedPartition* part); +extern int ped_partition_set_type_id (PedPartition* part, uint8_t id); +extern uint8_t ped_partition_get_type_id (const PedPartition* part); +extern int ped_partition_set_type_uuid (PedPartition* part, const uint8_t* uuid); +extern uint8_t* ped_partition_get_type_uuid (const PedPartition* part); extern int ped_partition_is_busy (const PedPartition* part); extern char* ped_partition_get_path (const PedPartition* part); diff --git a/libparted/disk.c b/libparted/disk.c index 8496fc0..80f3154 100644 --- a/libparted/disk.c +++ b/libparted/disk.c @@ -1458,6 +1458,36 @@ _assert_partition_name_feature (const PedDiskType* disk_type) return 1; } +static int +_assert_partition_type_id_feature (const PedDiskType* disk_type) +{ + if (!ped_disk_type_check_feature ( + disk_type, PED_DISK_TYPE_PARTITION_TYPE_ID)) { + ped_exception_throw ( + PED_EXCEPTION_ERROR, + PED_EXCEPTION_CANCEL, + "%s disk labels do not support partition type-ids.", + disk_type->name); + return 0; + } + return 1; +} + +static int +_assert_partition_type_uuid_feature (const PedDiskType* disk_type) +{ + if (!ped_disk_type_check_feature ( + disk_type, PED_DISK_TYPE_PARTITION_TYPE_UUID)) { + ped_exception_throw ( + PED_EXCEPTION_ERROR, + PED_EXCEPTION_CANCEL, + "%s disk labels do not support partition type-uuids.", + disk_type->name); + return 0; + } + return 1; +} + /** * Sets the name of a partition. * @@ -1510,6 +1540,62 @@ ped_partition_get_name (const PedPartition* part) return part->disk->type->ops->partition_get_name (part); } +int +ped_partition_set_type_id (PedPartition *part, uint8_t id) +{ + PED_ASSERT (part != NULL); + PED_ASSERT (part->disk != NULL); + PED_ASSERT (ped_partition_is_active (part)); + + if (!_assert_partition_type_id_feature (part->disk->type)) + return 0; + + PED_ASSERT (part->disk->type->ops->partition_set_type_id != NULL); + return part->disk->type->ops->partition_set_type_id (part, id); +} + +uint8_t +ped_partition_get_type_id (const PedPartition *part) +{ + PED_ASSERT (part != NULL); + PED_ASSERT (part->disk != NULL); + PED_ASSERT (ped_partition_is_active (part)); + + if (!_assert_partition_type_id_feature (part->disk->type)) + return 0; + + PED_ASSERT (part->disk->type->ops->partition_set_type_id != NULL); + return part->disk->type->ops->partition_get_type_id (part); +} + +int +ped_partition_set_type_uuid (PedPartition *part, const uint8_t* uuid) +{ + PED_ASSERT (part != NULL); + PED_ASSERT (part->disk != NULL); + PED_ASSERT (ped_partition_is_active (part)); + + if (!_assert_partition_type_uuid_feature (part->disk->type)) + return 0; + + PED_ASSERT (part->disk->type->ops->partition_set_type_uuid != NULL); + return part->disk->type->ops->partition_set_type_uuid (part, uuid); +} + +uint8_t* +ped_partition_get_type_uuid (const PedPartition *part) +{ + PED_ASSERT (part != NULL); + PED_ASSERT (part->disk != NULL); + PED_ASSERT (ped_partition_is_active (part)); + + if (!_assert_partition_type_uuid_feature (part->disk->type)) + return NULL; + + PED_ASSERT (part->disk->type->ops->partition_set_type_uuid != NULL); + return part->disk->type->ops->partition_get_type_uuid (part); +} + /** @} */ /** diff --git a/libparted/labels/dasd.c b/libparted/labels/dasd.c index 6b0b10d..1747202 100644 --- a/libparted/labels/dasd.c +++ b/libparted/labels/dasd.c @@ -117,6 +117,10 @@ static PedDiskOps dasd_disk_ops = { partition_set_name: NULL, partition_get_name: NULL, + partition_set_type_id: NULL, + partition_get_type_id: NULL, + partition_set_type_uuid: NULL, + partition_get_type_uuid: NULL, disk_set_flag: dasd_disk_set_flag, disk_get_flag: dasd_disk_get_flag, disk_is_flag_available: dasd_disk_is_flag_available, diff --git a/libparted/labels/dos.c b/libparted/labels/dos.c index b44ccaf..44c8cfc 100644 --- a/libparted/labels/dos.c +++ b/libparted/labels/dos.c @@ -1754,6 +1754,30 @@ msdos_partition_is_flag_available (const PedPartition* part, } } + +int +msdos_partition_set_type_id (PedPartition *part, uint8_t id) +{ + DosPartitionData *dos_part_data = part->disk_specific; + + dos_part_data->system = id; + + // TODO set the correct flag but there is no function for that. better cleanup flags + // and use system directly (like in gpt.c) + + return 1; +} + + +uint8_t _GL_ATTRIBUTE_PURE +msdos_partition_get_type_id (const PedPartition *part) +{ + const DosPartitionData *dos_part_data = part->disk_specific; + + return dos_part_data->system; +} + + static PedGeometry* _try_constraint (const PedPartition* part, const PedConstraint* external, PedConstraint* internal) @@ -2590,6 +2614,10 @@ static PedDiskOps msdos_disk_ops = { partition_set_name: NULL, partition_get_name: NULL, + partition_set_type_id: msdos_partition_set_type_id, + partition_get_type_id: msdos_partition_get_type_id, + partition_set_type_uuid: NULL, + partition_get_type_uuid: NULL, PT_op_function_initializers (msdos) }; @@ -2598,7 +2626,7 @@ static PedDiskType msdos_disk_type = { next: NULL, name: "msdos", ops: &msdos_disk_ops, - features: PED_DISK_TYPE_EXTENDED + features: PED_DISK_TYPE_EXTENDED | PED_DISK_TYPE_PARTITION_TYPE_ID }; void diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c index c5d7bb3..db18790 100644 --- a/libparted/labels/gpt.c +++ b/libparted/labels/gpt.c @@ -1685,6 +1685,45 @@ gpt_partition_get_name (const PedPartition *part) return gpt_part_data->translated_name; } + +static int +gpt_partition_set_type_uuid (PedPartition *part, const uint8_t* uuid) +{ + GPTPartitionData *gpt_part_data = part->disk_specific; + + efi_guid_t* type_uuid = &gpt_part_data->type; + memcpy(type_uuid, uuid, sizeof (efi_guid_t)); + + /* type_uuid is always LE, while uint8_t is always kind of BE */ + + type_uuid->time_low = PED_SWAP32(type_uuid->time_low); + type_uuid->time_mid = PED_SWAP16(type_uuid->time_mid); + type_uuid->time_hi_and_version = PED_SWAP16(type_uuid->time_hi_and_version); + + return 1; +} + + +static uint8_t* +gpt_partition_get_type_uuid (const PedPartition *part) +{ + const GPTPartitionData *gpt_part_data = part->disk_specific; + + efi_guid_t type_uuid = gpt_part_data->type; + + /* type_uuid is always LE, while uint8_t is always kind of BE */ + + type_uuid.time_low = PED_SWAP32(type_uuid.time_low); + type_uuid.time_mid = PED_SWAP16(type_uuid.time_mid); + type_uuid.time_hi_and_version = PED_SWAP16(type_uuid.time_hi_and_version); + + uint8_t* buf = ped_malloc(sizeof (uuid_t)); + memcpy(buf, &type_uuid, sizeof (uuid_t)); + + return buf; +} + + static int gpt_get_max_primary_partition_count (const PedDisk *disk) { @@ -1780,6 +1814,10 @@ static PedDiskOps gpt_disk_ops = partition_set_name: gpt_partition_set_name, partition_get_name: gpt_partition_get_name, + partition_set_type_id: NULL, + partition_get_type_id: NULL, + partition_set_type_uuid: gpt_partition_set_type_uuid, + partition_get_type_uuid: gpt_partition_get_type_uuid, disk_set_flag: gpt_disk_set_flag, disk_get_flag: gpt_disk_get_flag, disk_is_flag_available: gpt_disk_is_flag_available, @@ -1792,7 +1830,7 @@ static PedDiskType gpt_disk_type = next: NULL, name: "gpt", ops: &gpt_disk_ops, - features: PED_DISK_TYPE_PARTITION_NAME + features: PED_DISK_TYPE_PARTITION_NAME | PED_DISK_TYPE_PARTITION_TYPE_UUID }; void diff --git a/parted/parted.c b/parted/parted.c index 310f011..f840037 100644 --- a/parted/parted.c +++ b/parted/parted.c @@ -19,6 +19,7 @@ #include <config.h> #include <stdbool.h> +#include <uuid/uuid.h> #include "argmatch.h" #include "closeout.h" @@ -174,6 +175,8 @@ static const char* end_msg = N_("END is disk location, such as " static const char* state_msg = N_("STATE is one of: on, off\n"); static const char* device_msg = N_("DEVICE is usually /dev/hda or /dev/sda\n"); static const char* name_msg = N_("NAME is any word you want\n"); +static const char* type_id_msg = N_("TYPE_ID is a value between 0x01 and 0xff\n"); +static const char* type_uuid_msg = N_("TYPE_UUID is a non-null uuid\n"); static const char* copyright_msg = N_( "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" @@ -917,6 +920,110 @@ error: return 0; } +static int +do_type_id (PedDevice** dev, PedDisk** diskp) +{ + PedPartition* part = NULL; + char* input = NULL; + + if (!*diskp) + *diskp = ped_disk_new (*dev); + if (!*diskp) + goto error; + + if (!ped_disk_type_check_feature((*diskp)->type, PED_DISK_TYPE_PARTITION_TYPE_ID)) { + ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL, + _("%s disk labels do not support partition type-id."), + (*diskp)->type->name); + goto error; + } + + if (!command_line_get_partition (_("Partition number?"), *diskp, &part)) + goto error; + + uint8_t type_id = ped_partition_get_type_id (part); + + static char buf[8]; + snprintf(buf, 8, "0x%02x", type_id); + + input = command_line_get_word (_("Partition type-id?"), buf, NULL, 0); + if (!input) + goto error; + + unsigned int tmp = strtol (input, (char**) NULL, 0); + if (tmp == 0 || tmp > 0xff) { + ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL, + _("Invalid id.")); + goto error; + } + + if (!ped_partition_set_type_id (part, tmp)) + goto error_free_input; + + free (input); + + if (!ped_disk_commit (*diskp)) + goto error; + return 1; + +error_free_input: + free (input); +error: + return 0; +} + +static int +do_type_uuid (PedDevice** dev, PedDisk** diskp) +{ + PedPartition* part = NULL; + char* input = NULL; + + if (!*diskp) + *diskp = ped_disk_new (*dev); + if (!*diskp) + goto error; + + if (!ped_disk_type_check_feature((*diskp)->type, PED_DISK_TYPE_PARTITION_TYPE_UUID)) { + ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL, + _("%s disk labels do not support partition type-uuid."), + (*diskp)->type->name); + goto error; + } + + if (!command_line_get_partition (_("Partition number?"), *diskp, &part)) + goto error; + + uint8_t* type_uuid = ped_partition_get_type_uuid (part); + static char buf[UUID_STR_LEN]; + uuid_unparse_lower (type_uuid, buf); + free (type_uuid); + + input = command_line_get_word (_("Partition type-uuid?"), buf, NULL, 0); + if (!input) + goto error; + + uuid_t tmp; + if (uuid_parse (input, tmp) != 0 || uuid_is_null (tmp)) { + ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL, + _("Invalid uuid.")); + goto error; + } + + if (!ped_partition_set_type_uuid (part, tmp)) + goto error_free_input; + + free (input); + + if (!ped_disk_commit (*diskp)) + goto error; + return 1; + +error_free_input: + free (input); +error: + return 0; +} + static char* partition_print_flags (PedPartition const *part) { @@ -1161,6 +1268,8 @@ do_print (PedDevice** dev, PedDisk** diskp) Table* table; int has_extended; int has_name; + int has_id; + int has_uuid; int has_devices_arg = 0; int has_free_arg = 0; int has_list_arg = 0; @@ -1270,6 +1379,10 @@ do_print (PedDevice** dev, PedDisk** diskp) PED_DISK_TYPE_EXTENDED); has_name = ped_disk_type_check_feature ((*diskp)->type, PED_DISK_TYPE_PARTITION_NAME); + has_id = ped_disk_type_check_feature ((*diskp)->type, + PED_DISK_TYPE_PARTITION_TYPE_ID); + has_uuid = ped_disk_type_check_feature ((*diskp)->type, + PED_DISK_TYPE_PARTITION_TYPE_UUID); PedPartition* part; if (opt_output_mode == HUMAN) { @@ -1407,6 +1520,21 @@ do_print (PedDevice** dev, PedDisk** diskp) if (!(part->type & PED_PARTITION_FREESPACE)) { + if (has_id) { + uint8_t type_id = ped_partition_get_type_id (part); + static char buf[8]; + snprintf(buf, 8, "0x%02x", type_id); + ul_jsonwrt_value_s (&json, "type-id", buf); + } + + if (has_uuid) { + uint8_t* type_uuid = ped_partition_get_type_uuid (part); + static char buf[UUID_STR_LEN]; + uuid_unparse_lower (type_uuid, buf); + ul_jsonwrt_value_s (&json, "type-uuid", buf); + free (type_uuid); + } + if (has_name) { name = ped_partition_get_name (part); if (strcmp (name, "") != 0) @@ -2218,6 +2346,22 @@ _("name NUMBER NAME name partition NUMBER as NAME"), NULL), str_list_create (_(number_msg), _(name_msg), NULL), 1)); +command_register (commands, command_create ( + str_list_create_unique ("type-id", _("type-id"), NULL), + do_type_id, + str_list_create ( +_("type-id NUMBER TYPE-ID type-id set TYPE-ID of partition NUMBER"), +NULL), + str_list_create (_(number_msg), _(type_id_msg), NULL), 1)); + +command_register (commands, command_create ( + str_list_create_unique ("type-uuid", _("type-uuid"), NULL), + do_type_uuid, + str_list_create ( +_("type-uuid NUMBER TYPE-UUID type-uuid set TYPE-UUID of partition NUMBER"), +NULL), + str_list_create (_(number_msg), _(type_uuid_msg), NULL), 1)); + command_register (commands, command_create ( str_list_create_unique ("print", _("print"), NULL), do_print, diff --git a/tests/t0800-json-gpt.sh b/tests/t0800-json-gpt.sh index 8dd1862..354c0bd 100755 --- a/tests/t0800-json-gpt.sh +++ b/tests/t0800-json-gpt.sh @@ -62,6 +62,7 @@ cat <<EOF > exp || fail=1 "end": "20479s", "size": "10240s", "type": "primary", + "type-uuid": "0fc63daf-8483-4772-8e79-3d69d8477de4", "name": "test1" },{ "number": 2, @@ -69,6 +70,7 @@ cat <<EOF > exp || fail=1 "end": "61439s", "size": "40960s", "type": "primary", + "type-uuid": "a19d880f-05fc-4d3b-a006-743f0f84911e", "name": "test2", "flags": [ "raid" diff --git a/tests/t0801-json-msdos.sh b/tests/t0801-json-msdos.sh index a14a5af..c5446d8 100755 --- a/tests/t0801-json-msdos.sh +++ b/tests/t0801-json-msdos.sh @@ -52,13 +52,15 @@ cat <<EOF > exp || fail=1 "start": "5.00MiB", "end": "10.0MiB", "size": "5.00MiB", - "type": "primary" + "type": "primary", + "type-id": "0x83" },{ "number": 2, "start": "10.0MiB", "end": "30.0MiB", "size": "20.0MiB", "type": "extended", + "type-id": "0x0f", "flags": [ "lba" ] @@ -68,6 +70,7 @@ cat <<EOF > exp || fail=1 "end": "20.0MiB", "size": "10.0MiB", "type": "logical", + "type-id": "0x8e", "flags": [ "lvm" ]
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
