Merge branch 'main' of github.com:FyraLabs/readymade

Author: madonuko

Cargo.lock

@@ -49,6 +49,7 @@ scopeguard = "1.2.0"
 tracing-test = "0.2.5"
 serde-systemd-unit = { path = "./serde-systemd-unit" }
 format-bytes = "0.3.0"
+ipc-channel = { version = "0.19.0", features = ["async"] }
 
 [dependencies.os-detect]
 git = "https://github.com/FyraLabs/distinst"

Cargo.toml

@@ -2,6 +2,8 @@ use std::path::Component;
 use std::path::Path;
 use std::path::PathBuf;
 
+use super::install::InstallationState;
+
 #[derive(Debug, Clone, Default, serde::Serialize, serde::Deserialize)]
 pub struct MountTarget {
     #[doc(hidden)]
@@ -82,7 +84,7 @@ impl MountTargets {
 // 2. copy stuff
 // 3. funny setup_system()
 pub fn install_custom(
-    state: &crate::install::InstallationState,
+    state: &InstallationState,
     mounttags: &mut MountTargets,
 ) -> color_eyre::Result<()> {
     let destroot = Path::new("/mnt/custom");
@@ -96,7 +98,7 @@ pub fn install_custom(
             }
         };
 
-        let copy_source = PathBuf::from(crate::install::InstallationState::determine_copy_source());
+        let copy_source = PathBuf::from(InstallationState::determine_copy_source());
         if copy_source.is_file() {
             // TODO: impl callback status progress
             super::mksys::unsquash_copy(&copy_source, destroot, |_, _| {})?;