diff --git a/src/functions/unakite.rs b/src/functions/unakite.rs index bacdc47..089d5b0 100644 --- a/src/functions/unakite.rs +++ b/src/functions/unakite.rs @@ -141,10 +141,10 @@ pub fn remount(root: &str, oldroot: &str, efi: bool, efidir: &str, bootdev: &str } } -pub fn setup_unakite(root: &str, oldroot: &str, efi: bool, efidir: &str, bootdev: &str, kernel: &str) { +pub fn setup_unakite(root: &str, oldroot: &str, efi: bool, efidir: &str, bootdev: &str) { log::debug!("Setting up Unakite"); remount(root, oldroot, efi, efidir, bootdev, true); - base::install_base_packages(kernel.to_string()); + base::install_base_packages("kernel".to_string()); base::genfstab(); locale::set_locale("en_US.UTF-8 UTF-8".to_string()); locale::set_timezone("Europe/Berlin"); // TODO: get the proper timezone diff --git a/src/internal/config.rs b/src/internal/config.rs index bbbf3b6..1b7cd99 100755 --- a/src/internal/config.rs +++ b/src/internal/config.rs @@ -62,7 +62,6 @@ struct Unakite { oldroot: String, efidir: String, bootdev: String, - kernel: String, } pub fn read_config(configpath: PathBuf) { @@ -108,8 +107,7 @@ pub fn read_config(configpath: PathBuf) { &mut partitions, config.unakite.enable ); - let kerneltype = config.unakite.kernel.clone(); // Implemented because the borrow checker doesn't allow passing the value itself to the function - base::install_base_packages(kerneltype); + base::install_base_packages(kernel); base::genfstab(); println!(); log::info!("Installing bootloader : {}", config.bootloader.r#type); @@ -186,18 +184,18 @@ pub fn read_config(configpath: PathBuf) { log::info!("Setup unakite"); if config.partition.mode == PartitionMode::Auto && !config.partition.efi && config.unakite.enable && !config.partition.device.to_string().contains("nvme") { let root = PathBuf::from("/dev/").join(config.partition.device.as_str()); - unakite::setup_unakite(format!("{}2",root.to_str().unwrap()).as_str(), format!("{}3",root.to_str().unwrap()).as_str(), config.partition.efi, "/boot", format!("{}1",root.to_str().unwrap()).as_str(), &config.unakite.kernel) + unakite::setup_unakite(format!("{}2",root.to_str().unwrap()).as_str(), format!("{}3",root.to_str().unwrap()).as_str(), config.partition.efi, "/boot", format!("{}1",root.to_str().unwrap()).as_str()) } else if config.partition.mode == PartitionMode::Auto && config.partition.efi && config.unakite.enable && !config.partition.device.to_string().contains("nvme") { let root = PathBuf::from("/dev/").join(config.partition.device.as_str()); - unakite::setup_unakite(format!("{}2",root.to_str().unwrap()).as_str(), format!("{}3",root.to_str().unwrap()).as_str(), config.partition.efi, "/boot/efi", format!("{}1",root.to_str().unwrap()).as_str(), &config.unakite.kernel) + unakite::setup_unakite(format!("{}2",root.to_str().unwrap()).as_str(), format!("{}3",root.to_str().unwrap()).as_str(), config.partition.efi, "/boot/efi", format!("{}1",root.to_str().unwrap()).as_str()) } else if config.unakite.enable { - unakite::setup_unakite(&config.unakite.root, &config.unakite.oldroot, config.partition.efi, &config.unakite.efidir, &config.unakite.bootdev, &config.unakite.kernel); + unakite::setup_unakite(&config.unakite.root, &config.unakite.oldroot, config.partition.efi, &config.unakite.efidir, &config.unakite.bootdev); } else if config.partition.mode == PartitionMode::Auto && config.partition.efi && config.unakite.enable && config.partition.device.to_string().contains("nvme") { let root = PathBuf::from("/dev/").join(config.partition.device.as_str()); - unakite::setup_unakite(format!("{}p2",root.to_str().unwrap()).as_str(), format!("{}p3",root.to_str().unwrap()).as_str(), config.partition.efi, "/boot/efi", format!("{}p1",root.to_str().unwrap()).as_str(), &config.unakite.kernel) + unakite::setup_unakite(format!("{}p2",root.to_str().unwrap()).as_str(), format!("{}p3",root.to_str().unwrap()).as_str(), config.partition.efi, "/boot/efi", format!("{}p1",root.to_str().unwrap()).as_str()) } else if config.partition.mode == PartitionMode::Auto && !config.partition.efi && config.unakite.enable && config.partition.device.to_string().contains("nvme") { let root = PathBuf::from("/dev/").join(config.partition.device.as_str()); - unakite::setup_unakite(format!("{}p2",root.to_str().unwrap()).as_str(), format!("{}p3",root.to_str().unwrap()).as_str(), config.partition.efi, "/boot", format!("{}p1",root.to_str().unwrap()).as_str(), &config.unakite.kernel) + unakite::setup_unakite(format!("{}p2",root.to_str().unwrap()).as_str(), format!("{}p3",root.to_str().unwrap()).as_str(), config.partition.efi, "/boot", format!("{}p1",root.to_str().unwrap()).as_str()) } else { log::info!("Unakite disabled"); } diff --git a/src/main.rs b/src/main.rs index 3d88ad0..adee0c8 100755 --- a/src/main.rs +++ b/src/main.rs @@ -68,7 +68,6 @@ fn main() { args.efi, &args.efidir, &args.bootdev, - &args.kernel, ); }, Command::Config { config } => {