Bumping version to 0.2.1

Fixing /run remount on switch_root and elimenating /usr/bin/mount dependency.
Bumping version to 0.2.0
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 · 2026-07-30 14:11:00 +02:00 · 2026-07-29 23:16:32 +02:00
6 changed files with 332 additions and 185 deletions
@@ -1,43 +0,0 @@
-name: "Build Release Binary"
-run-name: "Build Release: ${{ inputs.tag_name }}"
-
-on:
-  # Allows triggering from another workflow
-  workflow_call:
-    inputs:
-      tag_name:
-        description: 'Git tag to build (e.g., v1.0.0)'
-        required: true
-        type: string
-
-  workflow_dispatch:  # Enables manual triggering
-    inputs:
-      tag_name:
-        description: 'Git tag to build (e.g., v1.0.0)'
-        required: true
-        type: string
-
-jobs:
-  build-release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        env:
-          GIT_DEFAULT_HASH: sha256
-        with:
-          # If triggered manually, use the input tag. 
-          # If triggered by push, GITHUB_REF_NAME is the tag.
-          ref: ${{ inputs.tag_name || gitea.ref_name }}
-
-      - name: Setup Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-
-      - name: Build Release Binary
-        run: cargo build --release
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: nyanit-${{ inputs.tag_name || gitea.ref_name }}
-          path: target/release/nyanit
@@ -1,40 +0,0 @@
-name: Create Release with Binary
-
-on:
-  workflow_dispatch:  # Enables manual triggering
-    inputs:
-      tag_name:
-        description: 'Git tag to build (e.g., v1.0.0)'
-        required: true
-        type: string
-      rel_description:
-        description: 'Release description'
-        required: false
-        type: string
-
-
-jobs:
-  # This job calls the reusable workflow
-  build-binary:
-    uses: ./.gitea/workflows/build-release-binary.yml
-    with:
-      tag_name: "${{ inputs.tag_name }}"
-
-  create-release:
-    needs: build-binary # Wait for the reusable workflow to finish
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: nyanit-${{ inputs.tag_name }}
-
-      - name: Create Release and Attach Binary
-        uses: actions/release-action@main
-        with:
-          artifacts: "nyanit-${{ inputs.tag_name }}"
-          api_key: ${{ secrets.bzzpss_release_psszz }}
-          tag_name: ${{ inputs.tag_name }}
-          name: Release ${{ inputs.tag_name }}
-          body: "Automated release for ${{ inputs.tag_name }}\n${{ inputs.rel_description }}"
-
@@ -34,9 +34,9 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"

 [[package]]
 name = "bitflags"
-version = "2.13.0"
+version = "2.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"

 [[package]]
 name = "by_address"
@@ -59,6 +59,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"

+[[package]]
+name = "cfg_aliases"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527"
+
 [[package]]
 name = "compact_str"
 version = "0.9.1"
@@ -93,7 +99,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim",
- "syn",
+ "syn 2.0.119",
 ]

 [[package]]
@@ -104,7 +110,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
 "darling_core",
 "quote",
- "syn",
+ "syn 2.0.119",
 ]

 [[package]]
@@ -115,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"
@@ -190,7 +196,7 @@ dependencies = [
 "indoc",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.119",
 ]

 [[package]]
@@ -221,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"
@@ -242,18 +248,30 @@ dependencies = [

 [[package]]
 name = "lru"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9"
+checksum = "0b6180140927ee907000b0aa540091f6ea512ead4447c92b8fc35bc72788a5a6"
 dependencies = [
 "hashbrown 0.17.1",
 ]

 [[package]]
 name = "memchr"
-version = "2.8.2"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
+
+[[package]]
+name = "nix"
+version = "0.31.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]

 [[package]]
 name = "num-conv"
@@ -287,8 +305,9 @@ checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f"

 [[package]]
 name = "nyanit"
-version = "0.1.2"
+version = "0.2.1"
 dependencies = [
+ "nix",
 "ratatui",
 "ratatui-textarea",
 "regex",
@@ -316,14 +335,14 @@ dependencies = [
 "by_address",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.119",
 ]

 [[package]]
 name = "portable-atomic"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
+checksum = "3d20d5497ef88037a52ff98267d066e7f11fcc5e99bbfbd58a42336193aacec3"

 [[package]]
 name = "powerfmt"
@@ -333,27 +352,27 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"

 [[package]]
 name = "proc-macro2"
-version = "1.0.106"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.45"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
 dependencies = [
 "proc-macro2",
 ]

 [[package]]
 name = "ratatui"
-version = "0.30.1"
+version = "0.30.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1695748e3a735b34968c887ceea5a380b43545903868ae8f5b666593100f6b68"
+checksum = "3274ba0a2c5e1bcad2a2005d20f4dc59dad26b2eb0940fb094500dba4099d57d"
 dependencies = [
 "instability",
 "ratatui-core",
@@ -364,14 +383,13 @@ dependencies = [

 [[package]]
 name = "ratatui-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d3603f354bba8c595fa47860e60142d7372b7210c27044c6a7d0e1a4336b44"
+checksum = "cbb175c433c8e28a809d1f5773a2ae96e68c0ce40db865cbab1020bf33ae479c"
 dependencies = [
 "bitflags",
 "compact_str",
 "hashbrown 0.17.1",
- "indoc",
 "itertools",
 "kasuari",
 "lru",
@@ -386,9 +404,9 @@ dependencies = [

 [[package]]
 name = "ratatui-termion"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c16cc35a9d9114e0b2bb4b22018b96ae7f5fe60e2595dc73e622b4e78624835"
+checksum = "87c732202fa5a71a9da0991013f0853e53f87048f45198e3a1ca3ee722accc2f"
 dependencies = [
 "instability",
 "ratatui-core",
@@ -410,9 +428,9 @@ dependencies = [

 [[package]]
 name = "ratatui-widgets"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef4f17dd7ac3abf5adc2b920a03c61eee4bfe6a88fa5191936895525371d79c"
+checksum = "66e3d19bcc9130ca376277d93b60767ff121ace3be06f5f95f81dd68956407d1"
 dependencies = [
 "bitflags",
 "hashbrown 0.17.1",
@@ -430,9 +448,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.12.4"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
+checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -442,9 +460,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.14"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -459,9 +477,9 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"

 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"

 [[package]]
 name = "ryu"
@@ -471,9 +489,9 @@ checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"

 [[package]]
 name = "serde"
-version = "1.0.228"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
 dependencies = [
 "serde_core",
 "serde_derive",
@@ -481,22 +499,22 @@ dependencies = [

 [[package]]
 name = "serde_core"
-version = "1.0.228"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.228"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 3.0.3",
 ]

 [[package]]
@@ -529,14 +547,25 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.119",
 ]

 [[package]]
 name = "syn"
-version = "2.0.117"
+version = "2.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -555,29 +584,29 @@ dependencies = [

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

 [[package]]
 name = "thiserror-impl"
-version = "2.0.18"
+version = "2.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 3.0.3",
 ]

 [[package]]
 name = "time"
-version = "0.3.49"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469"
+checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134"
 dependencies = [
 "deranged",
 "libc",
@@ -1,15 +1,15 @@
 [package]
 name = "nyanit"
-version = "0.1.2"
+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.12"
+regex = "1.1"
 termion = "4"

-
 [profile.release]
 lto = true
 debug = false
@@ -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()?;
+    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)? {
+    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,22 +130,23 @@ 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,
        })
    }

-    // pub fn bzz_unwrap<T,E>(&mut self, val: Result<T,E>) -> T {
-    //     match val {
-    //         Ok(v) => v,
-    //     }
-    // }
    /// 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,
-            Err(ex) => NyanitState::Error(format!("Error while trying to bzzz-pss things: {}", ex)),
+            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
@@ -279,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
@@ -338,6 +353,7 @@ impl NyanitTUI<'_> {
 }

 fn main() -> ExitCode {
+    // nyan_system::set_env_vars_unsafe();
    let mut app = NyanitTUI::new().unwrap();
    app.run().unwrap();
    // Terminal restores automatically when `stdout` (RawTerminal) is dropped
@@ -18,9 +18,13 @@
   Functions fot system interaction
 */

+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>,
@@ -81,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 {
@@ -109,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> {
@@ -120,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.
@@ -147,18 +199,24 @@ pub fn bcachefs_unlock(pass: String, dev: &str) -> Result<bool, ExecCommandError
    use std::process::Stdio;
    // "-k", "session" is important as it stores key in sessyin keyring what allows
    // system to mount filesystem after switch_root
-    let mut child = Command::new("bcachefs")
-    .args(&vec!["unlock", "-k", "session", dev])
+    let mut child = Command::new("/usr/bin/bcachefs")
+        .args(&vec!["unlock", "-k", "session", dev])
        .stdin(Stdio::piped())
        .stdout(Stdio::piped())
        .stderr(Stdio::piped())
        .spawn()?;

-    let mut c_stderr = child.stderr.take().ok_or_else(||{"Unable to get child process STDERR".to_string()})?;
+    let mut c_stderr = child
+        .stderr
+        .take()
+        .ok_or_else(|| "Unable to get child process STDERR".to_string())?;

    // Write password to STDIN in a limited scope
    {
-        let mut c_stdin = child.stdin.take().ok_or_else(||{"Unable to get child process STDIN".to_string()})?;
+        let mut c_stdin = child
+            .stdin
+            .take()
+            .ok_or_else(|| "Unable to get child process STDIN".to_string())?;
        // neccessery to use thread or we may be deadlocking
        c_stdin.write_all(pass.as_bytes())?;
        let bytes_written = c_stdin.write(b"\n")?;
@@ -184,7 +242,7 @@ pub fn bcachefs_unlock(pass: String, dev: &str) -> Result<bool, ExecCommandError

 /// Cheking if device is encripted
 pub fn bzzpss_dev_encrypted(dev_name: &str) -> Result<bool, ExecCommandError> {
-    match exec_command("bcachefs", &vec!["unlock", "--check", dev_name]) {
+    match exec_command("/usr/bin/bcachefs", &vec!["unlock", "--check", dev_name]) {
        Ok(_) => Ok(true), // if status OK - dev encrypted
        Err(ExecCommandError::CommandFailed(_)) => Ok(false), // if bcachefs returned error - unencrypted
        Err(ex) => Err(ex),                                   // othervice its error
@@ -194,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() {
@@ -211,35 +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<(), ExecCommandError> {
+    use nix::mount::{MsFlags, mount};
+    use std::path::Path;
+
+    // Mount proc filesystem
    // mount -t proc none /proc
-    exec_command("mount", &vec!["-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"),
+        proc_mount_flags,
+        None::<&str>,
+    )
+    .map_err(|ex| format!("Error mounting /proc: {}", ex.to_string()))?;
+
    // mount -t sysfs none /sys
-    exec_command("mount", &vec!["-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"),
+        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"),
+        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";
+
+//     // 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),
+//     };
+
+//     // 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("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!
@@ -251,7 +436,7 @@ pub fn hand_off_control(mnt_root: &str, init_path: &str) -> Result<(), ExecComma
    // 3. Execute switch_root.
    // This call replaces the current Rust process.
    // It only returns if an error occurs.
-    let err = Command::new("switch_root")
+    let err = Command::new("/usr/bin/switch_root")
        .arg(mnt_root)
        .arg(init_path)
        .exec();
Author	SHA256	Message	Date
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
kira	b4127f2fe8	Removed retarded git actions.	2026-07-20 23:22:20 +02:00
kira	1bf3ef0e15	Fixed mounting of /dev /sys /proc what is needed for other stuff to work.	2026-07-20 23:21:48 +02:00
kira	b90544bac5	Trying using absolute paths now for binaries executions.	2026-07-15 16:15:09 +02:00
kira	62a9e244a6	More verbose err, and setting up /usr/bin /usr/lib to env paths.	2026-07-15 01:13:28 +02:00