partitioning: Store table attributes in superset

We'll need to extend the partition attributes in order to permit
filesystem storage/modification.

Signed-off-by: Ikey Doherty <[email protected]>

Author: ikeycode

crates/partitioning/src/attributes.rs

@@ -5,7 +5,7 @@
 use gpt::partition_types;
 use uuid::Uuid;
 
-/// Represents the attributes of a GPT partition
+/// Represents the table attributes of a GPT partition
 #[derive(Debug, Clone)]
 pub struct GptAttributes {
     /// The type GUID that identifies the partition type
@@ -28,21 +28,27 @@ impl Default for GptAttributes {
 
 /// Represents attributes specific to different partition table types
 #[derive(Debug, Clone)]
-pub enum PartitionAttributes {
+pub enum TableAttributes {
     /// GPT partition attributes
     Gpt(GptAttributes),
     //Mbr(MbrAttributes),
 }
 
-impl PartitionAttributes {
+impl TableAttributes {
     /// Returns a reference to the GPT attributes if this is a GPT partition
     ///
     /// # Returns
     /// - `Some(&GptAttributes)` if this is a GPT partition
     /// - `None` if this is not a GPT partition
     pub fn as_gpt(&self) -> Option<&GptAttributes> {
         match self {
-            PartitionAttributes::Gpt(attr) => Some(attr),
+            TableAttributes::Gpt(attr) => Some(attr),
         }
     }
 }
+
+/// Represents the attributes of a partition
+#[derive(Debug, Clone)]
+pub struct PartitionAttributes {
+    pub table: TableAttributes,
+}

crates/partitioning/src/writer.rs

@@ -146,7 +146,7 @@ impl<'a> DiskWriter<'a> {
                 } => {
                     let start_lba = *start / 512;
                     let size_lba = (*end - *start) / 512;
-                    let (part_type, part_name) = match attributes.as_ref().and_then(|a| a.as_gpt()) {
+                    let (part_type, part_name) = match attributes.as_ref().and_then(|a| a.table.as_gpt()) {
                         Some(GptAttributes { type_guid, name, .. }) => {
                             (type_guid.clone(), name.clone().unwrap_or_default())
                         }

crates/provisioning/src/commands/create_partition.rs

@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-use partitioning::{gpt::partition_types, GptAttributes, PartitionAttributes};
+use partitioning::{gpt::partition_types, GptAttributes, PartitionAttributes, TableAttributes};
 
 use crate::{
     get_kdl_entry, get_kdl_property, get_property_str, Constraints, Context, Filesystem, FromKdlProperty, FromKdlType,
@@ -34,14 +34,16 @@ pub struct Command {
 
 impl Command {
     pub fn attributes(&self) -> PartitionAttributes {
-        PartitionAttributes::Gpt(GptAttributes {
-            type_guid: match &self.partition_type {
-                Some(p) => p.as_guid(),
-                None => partition_types::BASIC,
-            },
-            name: self.partition_type.as_ref().map(|p| p.to_string()),
-            uuid: None,
-        })
+        PartitionAttributes {
+            table: TableAttributes::Gpt(GptAttributes {
+                type_guid: match &self.partition_type {
+                    Some(p) => p.as_guid(),
+                    None => partition_types::BASIC,
+                },
+                name: self.partition_type.as_ref().map(|p| p.to_string()),
+                uuid: None,
+            }),
+        }
     }
 }