ahoneybun/nyxi-installer
1
0
Fork 0
mirror of https://gitlab.com/ahoneybun/nyxi-installer.git synced 2025-05-12 11:04:02 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

add logic for non-nvme drives

Browse source
This commit is contained in:
Aaron Honeycutt 2025-04-20 11:01:15 -06:00
parent 6623555a0b
commit bc2607c90e
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main.rs
View file

@ -50,8 +50,15 @@ fn format_drive(drive_name: &str) -> rsfdisk::Result<()> {
} }
fn format_partitions(drive_name: &str) { fn format_partitions(drive_name: &str) {
let efi_path = format!("{}p1", drive_name); // Check if drive name ends with a digit (e.g., "nvme0n1")
let root_path = format!("{}p2", drive_name); let suffix = if drive_name.chars().last().map(|c| c.is_ascii_digit()).unwrap_or(false) {
"p"
} else {
""
};
let efi_path = format!("{}{}1", drive_name, suffix);
let root_path = format!("{}{}2", drive_name, suffix);
let _efi_partition = Command::new("mkfs.fat") let _efi_partition = Command::new("mkfs.fat")
.arg("-F32") .arg("-F32")
@ -68,8 +75,15 @@ fn format_partitions(drive_name: &str) {
} }
fn mount_partitions(drive_name: &str) { fn mount_partitions(drive_name: &str) {
let efi_path = format!("{}p1", drive_name); // Check if drive name ends with a digit (e.g., "nvme0n1")
let root_path = format!("{}p2", drive_name); let suffix = if drive_name.chars().last().map(|c| c.is_ascii_digit()).unwrap_or(false) {
"p"
} else {
""
};
let efi_path = format!("{}{}1", drive_name, suffix);
let root_path = format!("{}{}2", drive_name, suffix);
let root_source = Some(Path::new(&root_path)); let root_source = Some(Path::new(&root_path));
let root_target = Path::new("/mnt"); let root_target = Path::new("/mnt");