From ec1f74b05df7b8cd3302809b6f4683aaa921fc4d Mon Sep 17 00:00:00 2001 From: Roey Darwish Dror Date: Wed, 29 May 2019 14:05:17 +0300 Subject: [PATCH] Use constants for partition indexes --- src/main.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index ff2096e..0a49460 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,6 +20,9 @@ use std::time::Duration; use structopt::StructOpt; use tempfile::tempdir; +const BOOT_PARTITION_INDEX: u8 = 1; +const ROOT_PARTITION_INDEX: u8 = 3; + static MKINITCPIO: &'static str = "MODULES=() BINARIES=() FILES=() @@ -163,10 +166,10 @@ fn create(command: CreateCommand) -> Result<(), Error> { thread::sleep(Duration::from_millis(1000)); info!("Formatting filesystems"); - let boot_partition = storage_device.get_partition(1)?; + let boot_partition = storage_device.get_partition(BOOT_PARTITION_INDEX)?; let boot_filesystem = Filesystem::format(&boot_partition, FilesystemType::Vfat, &mkfat)?; - let root_partition_base = storage_device.get_partition(3)?; + let root_partition_base = storage_device.get_partition(ROOT_PARTITION_INDEX)?; let encrypted_root = if let Some(cryptsetup) = &cryptsetup { info!("Encrypting the root filesystem"); EncryptedDevice::prepare(&cryptsetup, &root_partition_base)?; @@ -313,10 +316,10 @@ fn chroot(command: ChrootCommand) -> Result<(), Error> { let storage_device = storage::StorageDevice::from_path(command.block_device)?; let mount_point = tempdir().context(ErrorKind::TmpDirError)?; - let boot_partition = storage_device.get_partition(1)?; + let boot_partition = storage_device.get_partition(BOOT_PARTITION_INDEX)?; let boot_filesystem = Filesystem::from_partition(&boot_partition, FilesystemType::Vfat); - let root_partition_base = storage_device.get_partition(3)?; + let root_partition_base = storage_device.get_partition(ROOT_PARTITION_INDEX)?; let encrypted_root = if let Some(cryptsetup) = &cryptsetup { Some(EncryptedDevice::open( cryptsetup,