Bumping version to 0.2.1

Cargo.lock

@@ -121,9 +121,9 @@ checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 
 [[package]]
 name = "either"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
+checksum = "9e5e8f6c15a24b9a3ee5efec809ccd006d3b30e8b3bb63c39af737c7f87daa1d"
 
 [[package]]
 name = "equivalent"
@@ -227,9 +227,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.186"
+version = "0.2.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
 
 [[package]]
 name = "libm"
@@ -305,7 +305,7 @@ checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f"
 
 [[package]]
 name = "nyanit"
-version = "0.1.5"
+version = "0.2.1"
 dependencies = [
  "nix",
  "ratatui",
@@ -514,7 +514,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.2",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -563,9 +563,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a207d6d6a2b7fc470b80443726053f18a2481b7e1eee970597051596567987a3"
+checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -599,14 +599,14 @@ checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.2",
+ "syn 3.0.3",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.54"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e1d5e639ff6bab73cb6885cc7e7b1de96c3f32c68ec55f3952614bec1092244"
+checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134"
 dependencies = [
  "deranged",
  "libc",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nyanit"
-version = "0.1.5"
+version = "0.2.1"
 edition = "2024"
 
 [dependencies]
@@ -10,7 +10,6 @@ ratatui-textarea = { version = "0.9", default-features = false, features = ["ter
 regex = "1.1"
 termion = "4"
 
-
 [profile.release]
 lto = true
 debug = false

src/main.rs

@@ -39,9 +39,9 @@ use nyan_system::ExecCommandError;
 const BEE_CAT: &str = include_str!("bee_cat.txt");
 
 //const ROOT_PARTLABEL: &str = "bee-root";
-const ROOT_DEV: &str = "/dev/disk/by-partlabel/bee-root";
+const ROOT_PARTLABEL: &str = "bee-root";
 const TMP_ROOT: &str = "/mnt/bee_root";
-const TMP_ROOT_SNAPS: &str = "/mnt/bee-root/bzz_snaps";
+const TMP_ROOT_SNAPS: &str = "/mnt/bee_root/bzz_snaps";
 const SYS_INIT: &str = "/sbin/init";
 
 // fn bee_root_is_present() -> bool {
@@ -74,9 +74,12 @@ enum NyanitState {
 }
 
 /// Mounting bee-root and chiking if there any snapshots
-fn mount_and_check_snaps() -> Result<NyanitState, ExecCommandError> {
+fn mount_and_check_snaps(bee_root_dev: &str) -> Result<NyanitState, ExecCommandError> {
     // mount bee-root
-    nyan_system::mount_bee_root(TMP_ROOT, ROOT_DEV)?;
+    nyan_system::mount_bee_root(bee_root_dev, TMP_ROOT)?;
+
+    // let root_list = nyan_system::list_dir(TMP_ROOT)?;
+    // return Err(ExecCommandError::Other(root_list));
 
     // list snaps if any
     let mut snaps_list = nyan_system::list_bzzpss_snaps(TMP_ROOT_SNAPS)?;
@@ -90,23 +93,33 @@ fn mount_and_check_snaps() -> Result<NyanitState, ExecCommandError> {
     Ok(NyanitState::HandOff(TMP_ROOT.into()))
 }
 
-fn init_stage() -> Result<NyanitState, ExecCommandError> {
+fn init_stage() -> Result<(String, NyanitState), ExecCommandError> {
     // mount sysfss
     nyan_system::prepare_env().map_err(|ex| format!("prepare_env error: {}", ex))?;
 
+    // get bee-root device name aka /dev/sda1
+    // trying for max 3 sec
+    let bee_root_dev = nyan_system::try_find_partlabel(ROOT_PARTLABEL, 3)
+        .ok_or_else(|| "Timed out trying to find dev by partlabel.".to_string())?;
+
+    // works until this point!!!!
     // check if device is encrypted
-    if nyan_system::bzzpss_dev_encrypted(ROOT_DEV).map_err(|ex| format!("Error checking if device is encrypted: {}", ex))? {
+    if nyan_system::bzzpss_dev_encrypted(&bee_root_dev)
+        .map_err(|ex| format!("Error checking if device is encrypted: {}", ex))?
+    {
         // if encrypted return EnterPassword so used get promted for pass
-        return Ok(NyanitState::EnterPassword);
+        return Ok((bee_root_dev, NyanitState::EnterPassword));
     }
 
     // if unencrypted
-    mount_and_check_snaps()
+    let check_res = mount_and_check_snaps(&bee_root_dev)?;
+    Ok((bee_root_dev, check_res))
 }
 
 struct NyanitTUI<'a> {
     exit: bool,
     state: NyanitState,
+    bee_root_dev: String,
     list_state: ListState,
     time_counter: u32,
     textarea: Option<TextArea<'a>>,
@@ -117,6 +130,7 @@ impl NyanitTUI<'_> {
         Ok(Self {
             exit: false,
             state: NyanitState::Init,
+            bee_root_dev: String::new(),
             list_state: ListState::default().with_selected(Some(0)),
             time_counter: 0,
             textarea: None,
@@ -126,10 +140,13 @@ impl NyanitTUI<'_> {
     /// runs the application's main loop until the user quits
     pub fn run(&mut self) -> io::Result<()> {
         self.state = match init_stage() {
-            Ok(st) => st,
+            Ok(res) => {
+                self.bee_root_dev = res.0;
+                res.1
+            }
             Err(ex) => {
                 NyanitState::Error(format!("Error while trying to bzzz-pss things:\n{}", ex))
-            },
+            }
         };
 
         // if drive unencrypted and there is no root snapshots finish boot
@@ -276,11 +293,12 @@ impl NyanitTUI<'_> {
                         // try to unlock if enter pressed
                         Event::Key(event::Key::Char('\n')) => {
                             let password = self.textarea.as_ref().unwrap().lines()[0].clone();
-                            match nyan_system::bcachefs_unlock(password, ROOT_DEV) {
+                            match nyan_system::bcachefs_unlock(password, &self.bee_root_dev) {
                                 Ok(unlocked) => {
                                     if unlocked {
                                         // need to check for subvolumes and stuff
-                                        self.state = match mount_and_check_snaps() {
+                                        self.state = match mount_and_check_snaps(&self.bee_root_dev)
+                                        {
                                             Ok(st) => {
                                                 self.time_counter = 0;
                                                 st
@@ -334,8 +352,6 @@ impl NyanitTUI<'_> {
     }
 }
 
-
-
 fn main() -> ExitCode {
     // nyan_system::set_env_vars_unsafe();
     let mut app = NyanitTUI::new().unwrap();

src/nyan_system.rs

@@ -22,6 +22,9 @@ use nix;
 use std::fs;
 use std::process::Command;
 
+// timeout for block deices population
+const WAIT_FOR_BLK_DEVS: u64 = 5u64;
+
 #[derive(Debug)]
 pub struct CommandFailed {
     pub stderr: Vec<u8>,
@@ -82,6 +85,12 @@ impl From<String> for ExecCommandError {
     }
 }
 
+impl From<&str> for ExecCommandError {
+    fn from(err: &str) -> Self {
+        ExecCommandError::Other(err.to_string())
+    }
+}
+
 impl std::fmt::Display for ExecCommandError {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
@@ -110,6 +119,63 @@ pub fn exec_command(cmd: &str, args: &Vec<&str>) -> Result<(), ExecCommandError>
     }
 }
 
+pub fn try_find_partlabel(partlabel: &str, timeout_secs: u64) -> Option<String> {
+    use std::{thread, time::Duration};
+
+    let start = std::time::Instant::now();
+    while start.elapsed().as_secs() < timeout_secs {
+        if let Ok(Some(label)) = find_partlabel(partlabel) {
+            return Some(label);
+        }
+        thread::sleep(Duration::from_millis(100));
+    }
+    None
+}
+
+/// Gets device node aka /dev/sda1 from gpr partition label
+/// blkid -s PARTLABEL --match-token PARTLABEL="bzz-primary"
+pub fn find_partlabel(partlabel: &str) -> Result<Option<String>, ExecCommandError> {
+    let out = Command::new("/usr/bin/blkid")
+        .args([
+            "-s",
+            "PARTLABEL",
+            "-t",
+            format!("PARTLABEL=\"{}\"", partlabel).as_str(),
+        ])
+        .output()?;
+    if out.status.success() {
+        let out_text = String::from_utf8(out.stdout)?;
+
+        let split_res = out_text.split_once(':').ok_or_else(|| {
+            ExecCommandError::Other(format!("Unexpected blkid output format: \"{}\"", out_text))
+        })?;
+
+        Ok(Some(split_res.0.to_string()))
+    } else {
+        if let Some(code) = out.status.code()
+            && code == 2
+        {
+            Ok(None)
+        } else {
+            Err(ExecCommandError::Other(format!(
+                "Error while looking for partlabel={}: \"{}\"",
+                partlabel,
+                String::from_utf8(out.stderr).unwrap_or_else(|ex| ex.to_string())
+            )))
+        }
+    }
+}
+
+// pub fn list_dir(dirname: &str) -> Result<String, ExecCommandError> {
+//     let res: String = fs::read_dir(dirname)?
+//         .filter_map(|entry| entry.ok())
+//         .map(|entry| entry.file_name().to_string_lossy().to_string())
+//         .collect::<Vec<String>>()
+//         .join("\n");
+
+//     Ok(res)
+// }
+
 /// exec given command with arguments, returning stdout parsed to UTF-8 string
 /// capturing stderr in case or failure
 // pub fn exec_command_out(cmd: &str, args: &Vec<&str>) -> Result<String, ExecCommandError> {
@@ -121,21 +187,6 @@ pub fn exec_command(cmd: &str, args: &Vec<&str>) -> Result<(), ExecCommandError>
 //     }
 // }
 
-// ls /dev/disk/by-partlabel/
-// here we can find gpt part labels
-// pub fn list_gpt_labeled_devs() -> Result<Vec<String>, ExecCommandError> {
-//     use std::os::unix::fs::FileTypeExt;
-//     let mut res: Vec<String> = Vec::new();
-//     for maybe_entry in fs::read_dir("/dev/disk/by-partlabel/")? {
-//         let entry = maybe_entry?;
-//         if entry.file_type()?.is_block_device() {
-//             res.push(entry.path().to_str().unwrap().to_string());
-//         }
-//     }
-
-//     Ok(res)
-// }
-
 /// bcachefs unlock --file=/tmp/bzzpsspass.txt /dev/loop0somedev
 /// Ok so. It is stupid, because bcacheutils far from ideal.
 /// But if we provide wrong password from file or stdin this stuff plays stupid and asks for right password.
@@ -201,10 +252,17 @@ pub fn bzzpss_dev_encrypted(dev_name: &str) -> Result<bool, ExecCommandError> {
 //const TMP_ROOT: &str = "/mnt/bee-root";
 pub fn list_bzzpss_snaps(snaps_dir: &str) -> Result<Vec<String>, ExecCommandError> {
     use regex::Regex;
+    use std::path::Path;
+
     // root snapshoot in a form of bzz-yyyy-mm-ddTHH-MM-SS
     let re = Regex::new(r"^bzz-[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}-[0-9]{2}-[0-9]{2}$").unwrap();
 
     let mut res: Vec<String> = Vec::new();
+    // if snaps dir path do not exist return empty list
+    if !Path::new(snaps_dir).exists() {
+        return Ok(res);
+    }
+
     for maybe_entry in fs::read_dir(snaps_dir)? {
         let entry = maybe_entry?;
         if entry.file_type()?.is_dir() {
@@ -218,92 +276,155 @@ pub fn list_bzzpss_snaps(snaps_dir: &str) -> Result<Vec<String>, ExecCommandErro
     Ok(res)
 }
 
+// pulls /sys/class/block
+fn wait_for_block_devices(timeout_secs: u64) -> bool {
+    use std::path::Path;
+    use std::{thread, time::Duration};
+
+    let start = std::time::Instant::now();
+    while start.elapsed().as_secs() < timeout_secs {
+        // Check if any block device exists (e.g., sda, nvme0n1, vda)
+        // You can refine this to check for a specific device needed for root
+        if Path::new("/sys/class/block")
+            .read_dir()
+            .ok()
+            .and_then(|mut d| d.next().is_some().then_some(true))
+            .unwrap_or(false)
+        {
+            // Optional: Verify specific device needed for root exists
+            // if Path::new("/dev/nvme0n1").exists() { return true; }
+            return true;
+        }
+        thread::sleep(Duration::from_millis(100));
+    }
+    false
+}
+
+
 // mounting process
 //# Mount essential virtual filesystems
 // mount -t proc none /proc
 // mount -t sysfs none /sys
 // modprobe bcachefs
-pub fn prepare_env() -> Result<(), String> {
-    use nix::mount::{mount, MsFlags};
-
+pub fn prepare_env() -> Result<(), ExecCommandError> {
+    use nix::mount::{MsFlags, mount};
     use std::path::Path;
 
     // Mount proc filesystem
     // mount -t proc none /proc
+    let proc_mount_flags =
+        MsFlags::MS_NOSUID | MsFlags::MS_NODEV | MsFlags::MS_NOEXEC | MsFlags::MS_RELATIME;
     mount(
         Some("proc"),
         Path::new("/proc"),
         Some("proc"),
-        MsFlags::empty(),
+        proc_mount_flags,
         None::<&str>,
     )
     .map_err(|ex| format!("Error mounting /proc: {}", ex.to_string()))?;
 
     // mount -t sysfs none /sys
+    let sys_mount_flags =
+        MsFlags::MS_NOSUID | MsFlags::MS_NODEV | MsFlags::MS_NOEXEC | MsFlags::MS_RELATIME;
     mount(
         Some("sysfs"),
         Path::new("/sys"),
         Some("sysfs"),
-        MsFlags::empty(),
+        sys_mount_flags,
         None::<&str>,
     )
     .map_err(|ex| format!("Error mounting /sys: {}", ex.to_string()))?;
 
+    //waiting for block devs population
+    if wait_for_block_devices(WAIT_FOR_BLK_DEVS) == false {
+        return Err("Waiting for block devices to get populated timed out.".into());
+    }
+
+    let dev_mount_flags = MsFlags::MS_NOSUID | MsFlags::MS_RELATIME;
     mount(
         Some("devtmpfs"),
         "/dev",
         Some("devtmpfs"),
-        MsFlags::empty(),
-        None::<&str>,
+        dev_mount_flags,
+        Some("mode=0755"),
     )
     .map_err(|ex| format!("Error mounting /dev: {}", ex.to_string()))?;
 
+    //mount -t tmpfs -o nosuid,nodev,noexec,mode=0755 none /run
+    let run_mount_flags = MsFlags::MS_NOSUID | MsFlags::MS_NODEV | MsFlags::MS_NOEXEC | MsFlags::MS_RELATIME;
+    mount(
+        Some("run"),
+        "/run",
+        Some("tmpfs"),
+        run_mount_flags,
+        Some("mode=0755"),
+    )
+    .map_err(|ex| format!("Error mounting /run: {}", ex.to_string()))?;
+
     // modprobe bcachefs
     // exec_command("modprobe", &vec!["bcachefs"])?;
+
+    // Creating dir for udev so this little shit wont hang
+    // fs::create_dir("/run/udev")?;
+
+
     Ok(())
 }
 
 ///
 ///  MUST be done before spawning any threads or async runtimes
-pub fn set_env_vars_unsafe() -> () {
-    use std::env;
-    // 1. Define your custom paths
-    let custom_bin = "/usr/bin";
-    let custom_lib = "/usr/lib";
+// pub fn set_env_vars_unsafe() -> () {
+//     use std::env;
+//     // 1. Define your custom paths
+//     let custom_bin = "/usr/bin";
+//     let custom_lib = "/usr/lib";
 
-    // 2. Retrieve existing paths to append/prepend (optional but recommended)
-    // 3. Construct new path strings
-    let new_path = match env::var("PATH") {
-        Err(_) => custom_bin.to_string(),
-        Ok(v) => format!("{}:{}", custom_bin, v),
-    };
+//     // 2. Retrieve existing paths to append/prepend (optional but recommended)
+//     // 3. Construct new path strings
+//     let new_path = match env::var("PATH") {
+//         Err(_) => custom_bin.to_string(),
+//         Ok(v) => format!("{}:{}", custom_bin, v),
+//     };
 
-    let new_ld_path = match env::var("LD_LIBRARY_PATH") {
-        Err(_) => custom_lib.to_string(),
-        Ok(v) => format!("{}:{}", custom_lib, v),
-    };
+//     let new_ld_path = match env::var("LD_LIBRARY_PATH") {
+//         Err(_) => custom_lib.to_string(),
+//         Ok(v) => format!("{}:{}", custom_lib, v),
+//     };
 
-    // 4. Set environment variables (UNSAFE in Rust 2024+)
-    // MUST be done before spawning any threads or async runtimes
-    unsafe {
-        env::set_var("PATH", new_path);
-        env::set_var("LD_LIBRARY_PATH", new_ld_path);
-    }
-}
+//     // 4. Set environment variables (UNSAFE in Rust 2024+)
+//     // MUST be done before spawning any threads or async runtimes
+//     unsafe {
+//         env::set_var("PATH", new_path);
+//         env::set_var("LD_LIBRARY_PATH", new_ld_path);
+//     }
+// }
 
 // # Mount the real root filesystem
-pub fn mount_bee_root(mount_point: &str, dev_name: &str) -> Result<(), ExecCommandError> {
-    exec_command("/usr/bin/mount", &vec!["-o", "ro", dev_name, mount_point])?;
+pub fn mount_bee_root(dev_name: &str, mount_point: &str) -> Result<(), ExecCommandError> {
+    use nix::mount::{MsFlags, mount};
+    use std::path::Path;
+
+    let root_mount_flags = MsFlags::MS_RDONLY | MsFlags::MS_RELATIME;
+    mount(
+        Some(dev_name),
+        Path::new(mount_point),
+        Some("bcachefs"),
+        root_mount_flags,
+        None::<&str>,
+    )
+    .map_err(|ex| format!("Error mounting root {} to {} :\n{}",dev_name, mount_point, ex.to_string()))?;
+    // exec_command("/usr/bin/mount", &vec!["-o", "ro", dev_name, mount_point])?;
     Ok(())
 }
 
 // finish boot
 pub fn hand_off_control(mnt_root: &str, init_path: &str) -> Result<(), ExecCommandError> {
-    use std::env;
+    //use std::env;
     use std::os::unix::process::CommandExt;
 
     // 2. Change directory to the new root (Mandatory for switch_root)
-    env::set_current_dir(mnt_root)?;
+    // Actually this may be a problem!
+    // env::set_current_dir(mnt_root)?;
 
     // # Clean up virtual filesystems
     // !!! do not do this, switch_root handle this stuff and fail if thay not present!