From 2c11c9b251991633fb309b190fb2774d2a3b1fca Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Thu, 1 Aug 2019 11:28:20 +0300
Subject: [PATCH] More debug logs

---
 src/main.rs | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 89eafa4..9e016af 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,14 +13,14 @@ use crate::storage::*;
 use crate::tool::Tool;
 use byte_unit::Byte;
 use failure::{Fail, ResultExt};
-use log::{debug, error, info, warn, LevelFilter};
+use log::{debug, error, info, log_enabled, warn, Level, LevelFilter};
 use pretty_env_logger;
 use std::collections::HashSet;
 use std::fs;
 use std::io::{stdin, stdout, BufRead, Write};
 use std::os::unix::{fs::PermissionsExt, process::CommandExt as UnixCommandExt};
 use std::path::{Path, PathBuf};
-use std::process::exit;
+use std::process::{exit, Command as ProcessCommand};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::thread;
@@ -218,6 +218,18 @@ fn create(command: CreateCommand, running: Arc<AtomicBool>) -> Result<(), Error>
 
     let mount_stack = mount(mount_point.path(), &boot_filesystem, &root_filesystem)?;
 
+    if log_enabled!(Level::Debug) {
+        debug!("lsblk:");
+        ProcessCommand::new("lsblk")
+            .arg("--fs")
+            .spawn()
+            .and_then(|mut p| p.wait())
+            .map_err(|e| {
+                error!("Error running lsblk: {}", e);
+            })
+            .ok();
+    }
+
     let mut packages: HashSet<String> = [
         "base",
         "grub",
@@ -354,6 +366,12 @@ fn create(command: CreateCommand, running: Arc<AtomicBool>) -> Result<(), Error>
         .arg(format!("grub-install --target=i386-pc --boot-directory /boot {} && grub-install --target=x86_64-efi --efi-directory /boot --boot-directory /boot --removable &&  grub-mkconfig -o /boot/grub/grub.cfg", disk_path.display()))
         .run(ErrorKind::Bootloader)?;
 
+    debug!(
+        "GRUB configuration: {}",
+        fs::read_to_string(mount_point.path().join("boot/grub/grub.cfg"))
+            .unwrap_or_else(|e| e.to_string())
+    );
+
     if command.interactive {
         info!("Dropping you to chroot. Do as you wish to customize the installation");
         arch_chroot