Udated some dependencies

Added script to build initcpio image
Bumping version to 0.2.1
2026-08-18 22:45:32 +02:00 · 2026-08-18 22:45:02 +02:00 · 2026-08-01 22:56:29 +02:00 · 2026-08-01 22:56:07 +02:00 · 2026-07-31 15:55:17 +02:00 · 2026-07-31 15:54:54 +02:00
5 changed files with 302 additions and 113 deletions
@@ -4,9 +4,9 @@ version = 4

 [[package]]
 name = "aho-corasick"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba"
 dependencies = [
 "memchr",
 ]
@@ -81,9 +81,9 @@ dependencies = [

 [[package]]
 name = "darling"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
+checksum = "88490bf1b990d87eaaa7ac8aa887f629a08e7359765b4911faf63c3763347d23"
 dependencies = [
 "darling_core",
 "darling_macro",
@@ -91,26 +91,26 @@ dependencies = [

 [[package]]
 name = "darling_core"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
+checksum = "084e274f91c482280130e1e34e0b8d6e66776a060d7b6de7b84289ca778868c4"
 dependencies = [
 "ident_case",
 "proc-macro2",
 "quote",
 "strsim",
- "syn 2.0.119",
+ "syn 3.0.3",
 ]

 [[package]]
 name = "darling_macro"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
+checksum = "68f5792fa0d41cd2325ce0ffa64f0a340eaebd4971a3a0c5e1ffd2cc488a355e"
 dependencies = [
 "darling_core",
 "quote",
- "syn 2.0.119",
+ "syn 3.0.3",
 ]

 [[package]]
@@ -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"
@@ -131,12 +131,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

-[[package]]
-name = "fast-srgb8"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
-
 [[package]]
 name = "foldhash"
 version = "0.2.0"
@@ -188,15 +182,15 @@ dependencies = [

 [[package]]
 name = "instability"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb2d60ef19920a3a9193c3e371f726ec1dafc045dac788d0fb3704272458971"
+checksum = "2bf84e73fa6f27f299dec58e13223cf70db80da872eb921d4f6138342a0eabc8"
 dependencies = [
 "darling",
 "indoc",
 "proc-macro2",
 "quote",
- "syn 2.0.119",
+ "syn 3.0.3",
 ]

 [[package]]
@@ -227,9 +221,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"
@@ -239,18 +233,18 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"

 [[package]]
 name = "line-clipping"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f50e8f47623268b5407192d26876c4d7f89d686ca130fdc53bced4814cd29f8"
+checksum = "e752191d037c44ad111a8caa762921926658402f01cc1253f7bef2020ece4f5e"
 dependencies = [
 "bitflags",
 ]

 [[package]]
 name = "lru"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6180140927ee907000b0aa540091f6ea512ead4447c92b8fc35bc72788a5a6"
+checksum = "5d2f2f9b4ba7e6b24d95e7e899329d35be83bcded72c8540cdd5368932d1d90a"
 dependencies = [
 "hashbrown 0.17.1",
 ]
@@ -305,7 +299,7 @@ checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f"

 [[package]]
 name = "nyanit"
-version = "0.1.5"
+version = "0.2.1"
 dependencies = [
 "nix",
 "ratatui",
@@ -316,21 +310,21 @@ dependencies = [

 [[package]]
 name = "palette"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6"
+checksum = "ddeed8580d347d2abf3dcf06a5f0b3dc020258338526b277847cd4248a70fc64"
 dependencies = [
 "approx",
- "fast-srgb8",
 "libm",
 "palette_derive",
+ "palette_math",
 ]

 [[package]]
 name = "palette_derive"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30"
+checksum = "88537020289b719d81be994ccf1bbf4990f477e2f69ee52fe3e45f43a02e56be"
 dependencies = [
 "by_address",
 "proc-macro2",
@@ -339,10 +333,19 @@ dependencies = [
 ]

 [[package]]
-name = "portable-atomic"
-version = "1.14.0"
+name = "palette_math"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d20d5497ef88037a52ff98267d066e7f11fcc5e99bbfbd58a42336193aacec3"
+checksum = "6e6eb142958d64335fb0e345c5b9ead2ecd6fc438c307e9d7d3c4fd428dbaf12"
+dependencies = [
+ "libm",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85"

 [[package]]
 name = "powerfmt"
@@ -460,9 +463,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.16"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad"
+checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -514,7 +517,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 3.0.2",
+ "syn 3.0.3",
 ]

 [[package]]
@@ -563,9 +566,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",
@@ -584,29 +587,29 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "2.0.19"
+version = "2.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9"
+checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "2.0.19"
+version = "2.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd"
+checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af"
 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",
@@ -1,16 +1,15 @@
 [package]
 name = "nyanit"
-version = "0.1.5"
+version = "0.2.1"
 edition = "2024"

 [dependencies]
 nix = { version = "0.31", features = ["mount"] }
 ratatui = { version = "0.30", default-features = false, features = ["termion"] }
 ratatui-textarea = { version = "0.9", default-features = false, features = ["termion"] }
-regex = "1.1"
+regex = "1"
 termion = "4"

-
 [profile.release]
 lto = true
 debug = false
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+echo "work dir: $1"
+
+_tools_list=(
+  /usr/bin/bcachefs
+  /usr/bin/fsck
+  /usr/bin/fsck.vfat
+  /usr/bin/switch_root
+  /usr/bin/blkid
+)
+
+workdir=$1
+
+echo "Populate initdramfs tree..."
+cd $workdir
+mkdir -p initramfs/{dev,proc,sys,run,mnt,mnt/bee_root,tmp,etc,usr,usr/bin,usr/lib}
+
+echo "Create /bin /lib /lib64 simlinks"
+cd $workdir/initramfs
+ln -s usr/lib lib64
+ln -s usr/lib lib
+ln -s usr/bin bin
+cd $workdir/initramfs/usr
+ln -s lib lib64
+
+echo "Install NYANIT..."
+cd $workdir
+lddtree --bindir / --copy-to-tree $workdir/initramfs init
+
+echo "Copy libs and binaries"
+cd $workdir
+lddtree --copy-to-tree $workdir/initramfs "${_tools_list[@]}"
+
+echo "Remove setuid flag from everything..."
+chmod -R a-s $workdir/initramfs
+
+fakeroot -- sh << EOF
+echo "Create console device node"
+cd $workdir/initramfs
+mknod -m 622 dev/console c 5 1
+
+# Create cpio archive
+echo "Create cpio archive"
+cd $workdir/initramfs
+find . | cpio -ov --format=newc > ../initramfs.cpio
+
+EOF
+
+echo "Done!"
@@ -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();
@@ -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!
Author	SHA256	Message	Date
kira	3a5d6d545c	Udated some dependencies	2026-08-18 22:45:32 +02:00
kira	5ef902fc29	Added script to build initcpio image	2026-08-18 22:45:02 +02:00
kira	fecd188b4d	Bumping version to 0.2.1	2026-08-01 22:56:29 +02:00
kira	ef16746068	Fixing /run remount on switch_root and elimenating /usr/bin/mount dependency.	2026-08-01 22:56:07 +02:00
kira	1998df9720	Bumping version to 0.2.0	2026-07-31 15:55:17 +02:00
kira	84d210d07c	blkid partlabel discovery now working. Also some cleanups.	2026-07-31 15:54:54 +02:00
kira	9601cc300b	Trying to fix blkid thing. Add wayting for sysfs logic.	2026-07-30 14:11:00 +02:00
kira	316ffce414	Trying to figure out blkid thing. Add --probe flag.	2026-07-29 23:16:32 +02:00
kira	c132ca3ffa	Bumping version to 0.1.6	2026-07-29 15:35:41 +02:00
kira	0ea1a9bb3f	Using blkid utility to determine dev name by gpt partlabel.	2026-07-29 15:34:52 +02:00