Merge branch 'next/minor' of github.com:Start9Labs/start-os into next/major

system-images/compat/Cargo.lock

@@ -683,6 +683,28 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
+[[package]]
+name = "container-init"
+version = "0.1.0"
+dependencies = [
+ "async-stream",
+ "color-eyre",
+ "futures",
+ "helpers",
+ "imbl",
+ "nix 0.27.1",
+ "procfs",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "tracing-error",
+ "tracing-futures",
+ "tracing-subscriber",
+ "yajrc 0.1.0 (git+https://github.com/dr-bonez/yajrc.git?branch=develop)",
+]
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -1236,28 +1258,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "embassy_container_init"
-version = "0.1.0"
-dependencies = [
- "async-stream",
- "color-eyre",
- "futures",
- "helpers",
- "imbl",
- "nix 0.27.1",
- "procfs",
- "serde",
- "serde_json",
- "tokio",
- "tokio-stream",
- "tracing",
- "tracing-error",
- "tracing-futures",
- "tracing-subscriber",
- "yajrc 0.1.0 (git+https://github.com/dr-bonez/yajrc.git?branch=develop)",
-]
-
 [[package]]
 name = "emver"
 version = "0.1.7"
@@ -4434,6 +4434,7 @@ dependencies = [
  "clap 3.2.25",
  "color-eyre",
  "console",
+ "container-init",
  "cookie 0.18.0",
  "cookie_store 0.20.0",
  "current_platform",
@@ -4442,7 +4443,6 @@ dependencies = [
  "ed25519 2.2.3",
  "ed25519-dalek 1.0.1",
  "ed25519-dalek 2.0.0",
- "embassy_container_init",
  "emver",
  "fd-lock-rs",
  "futures",

system-images/compat/Cargo.toml

@@ -11,7 +11,7 @@ anyhow = { version = "1.0.40", features = ["backtrace"] }
 beau_collector = "0.2.1"
 clap = "2.33.3"
 dashmap = "5.3.2"
-start-os = { path = "../../backend", default-features = false }
+start-os = { path = "../../core/startos", default-features = false }
 emver = { version = "0.1.7", git = "https://github.com/Start9Labs/emver-rs.git", features = [
     "serde",
 ] }

system-images/compat/Makefile

@@ -17,8 +17,8 @@ docker-images/aarch64.tar: Dockerfile target/aarch64-unknown-linux-musl/release/
 docker-images/x86_64.tar: Dockerfile target/x86_64-unknown-linux-musl/release/compat docker-images
 	docker buildx build --build-arg ARCH=x86_64 --tag start9/x_system/compat --platform=linux/amd64 -o type=docker,dest=docker-images/x86_64.tar .
 
-target/aarch64-unknown-linux-musl/release/compat: $(COMPAT_SRC) ../../backend/Cargo.lock
+target/aarch64-unknown-linux-musl/release/compat: $(COMPAT_SRC) ../../core/Cargo.lock
 	ARCH=aarch64 ./build.sh
 
-target/x86_64-unknown-linux-musl/release/compat: $(COMPAT_SRC) ../../backend/Cargo.lock
+target/x86_64-unknown-linux-musl/release/compat: $(COMPAT_SRC) ../../core/Cargo.lock
 	ARCH=x86_64 ./build.sh