Fix broken encryption

This commit is contained in:
Roey Darwish Dror 2019-05-29 15:03:35 +03:00
parent 10faad551b
commit 7f6a0c0a0f

View File

@ -206,13 +206,13 @@ fn create(command: CreateCommand) -> Result<(), Error> {
.args(&["mkinitcpio", "-p", "linux"]) .args(&["mkinitcpio", "-p", "linux"])
.run(ErrorKind::Initramfs)?; .run(ErrorKind::Initramfs)?;
if cryptsetup.is_some() { if encrypted_root.is_some() {
debug!("Setting up GRUB for an encrypted root partition"); debug!("Setting up GRUB for an encrypted root partition");
let uuid = blkid let uuid = blkid
.unwrap() .unwrap()
.execute() .execute()
.arg(root_partition.path()) .arg(root_partition_base.path())
.args(&["-o", "value", "-s", "UUID"]) .args(&["-o", "value", "-s", "UUID"])
.run_text_output(ErrorKind::Partitioning)?; .run_text_output(ErrorKind::Partitioning)?;
let trimmed = uuid.trim(); let trimmed = uuid.trim();