Skip to content

Commit d2529bb

Browse files
committed
partitioning: Remove unused per-partition alignment field
Signed-off-by: Ikey Doherty <[email protected]>
1 parent e0f6e2d commit d2529bb

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

crates/partitioning/src/strategy.rs

-10
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
//! // Request needed partitions
2121
//! strategy.add_request(PartitionRequest {
2222
//! size: SizeRequirement::Exact(512 * 1024 * 1024), // 512MB EFI partition
23-
//! alignment: None,
2423
//! });
2524
//! strategy.add_request(PartitionRequest {
2625
//! size: SizeRequirement::Remaining, // Rest for root
27-
//! alignment: None,
2826
//! });
2927
//! ```
3028
@@ -63,7 +61,6 @@ pub enum SizeRequirement {
6361
#[derive(Debug, Clone)]
6462
pub struct PartitionRequest {
6563
pub size: SizeRequirement,
66-
pub alignment: Option<u64>,
6764
}
6865

6966
/// Handles planning partition layouts according to specific strategies
@@ -265,7 +262,6 @@ mod tests {
265262
fn root_partition() -> PartitionRequest {
266263
PartitionRequest {
267264
size: SizeRequirement::AtLeast(ROOT_MIN),
268-
alignment: None,
269265
}
270266
}
271267

@@ -276,23 +272,20 @@ mod tests {
276272
min: ROOT_MIN,
277273
max: ROOT_MAX,
278274
},
279-
alignment: None,
280275
}
281276
}
282277

283278
/// Creates a standard EFI system partition request
284279
fn efi_partition() -> PartitionRequest {
285280
PartitionRequest {
286281
size: SizeRequirement::Exact(EFI_SIZE),
287-
alignment: None,
288282
}
289283
}
290284

291285
/// Creates a /boot partition request
292286
fn boot_partition() -> PartitionRequest {
293287
PartitionRequest {
294288
size: SizeRequirement::Exact(BOOT_SIZE),
295-
alignment: None,
296289
}
297290
}
298291

@@ -303,15 +296,13 @@ mod tests {
303296
min: SWAP_MIN,
304297
max: SWAP_MAX,
305298
},
306-
alignment: None,
307299
}
308300
}
309301

310302
/// Creates a home partition request that uses all remaining space
311303
fn home_partition() -> PartitionRequest {
312304
PartitionRequest {
313305
size: SizeRequirement::Remaining,
314-
alignment: None,
315306
}
316307
}
317308
fn create_test_disk() -> MockDisk {
@@ -382,7 +373,6 @@ mod tests {
382373
strategy.add_request(boot_partition());
383374
strategy.add_request(PartitionRequest {
384375
size: SizeRequirement::Remaining,
385-
alignment: None,
386376
});
387377

388378
eprintln!("\nMinimal Server Strategy:\n{}", strategy.describe());

disk-test/src/main.rs

-5
Original file line numberDiff line numberDiff line change
@@ -80,36 +80,31 @@ where
8080
min: 256 * 1024 * 1024,
8181
max: 1 * 1024 * 1024 * 1024,
8282
},
83-
alignment: None,
8483
});
8584
// xbootldr
8685
strategy.add_request(PartitionRequest {
8786
size: SizeRequirement::Range {
8887
min: 2 * 1024 * 1024 * 1024,
8988
max: 4 * 1024 * 1024 * 1024,
9089
},
91-
alignment: None,
9290
});
9391
// swap
9492
strategy.add_request(PartitionRequest {
9593
size: SizeRequirement::Range {
9694
min: 1 * 1024 * 1024 * 1024,
9795
max: 4 * 1024 * 1024 * 1024,
9896
},
99-
alignment: None,
10097
});
10198
// root
10299
strategy.add_request(PartitionRequest {
103100
size: SizeRequirement::Range {
104101
min: 30 * 1024 * 1024 * 1024,
105102
max: 120 * 1024 * 1024 * 1024,
106103
},
107-
alignment: None,
108104
});
109105
// home
110106
strategy.add_request(PartitionRequest {
111107
size: SizeRequirement::AtLeast(50 * 1024 * 1024 * 1024),
112-
alignment: None,
113108
});
114109
info!("Applying strategy: {}", strategy.describe());
115110
strategy.apply(&mut planner)?;

0 commit comments

Comments
 (0)