Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

only reset docker state on hard-restart

Browse Source
This commit is contained in:
Aiden McClelland
2022-01-19 16:28:24 -07:00
committed by Aiden McClelland
parent 5278a22aef
commit 4a97908b2b
3 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
appmgr/src/init.rs
View File

@@ -6,7 +6,10 @@ use crate::install::PKG_DOCKER_DIR;
use crate::util::Invoke;
use crate::Error;
pub const HARD_RESTART_PATH: &str = "/embassy-os/hard-restart";
pub async fn init(cfg: &RpcContextConfig, product_key: &str) -> Result<(), Error> {
let hard_restart = tokio::fs::metadata(HARD_RESTART_PATH).await.is_ok();
let secret_store = cfg.secret_store().await?;
let log_dir = cfg.datadir().join("main").join("logs");
if tokio::fs::metadata(&log_dir).await.is_err() {
@@ -24,15 +27,17 @@ pub async fn init(cfg: &RpcContextConfig, product_key: &str) -> Result<(), Error
tokio::fs::create_dir_all(&tmp_dir).await?;
}
let tmp_docker = cfg.datadir().join("package-data/tmp/docker");
if tokio::fs::metadata(&tmp_docker).await.is_ok() {
tokio::fs::remove_dir_all(&tmp_docker).await?;
if hard_restart {
if tokio::fs::metadata(&tmp_docker).await.is_ok() {
tokio::fs::remove_dir_all(&tmp_docker).await?;
}
Command::new("cp")
.arg("-r")
.arg("/var/lib/docker")
.arg(&tmp_docker)
.invoke(crate::ErrorKind::Filesystem)
.await?;
}
Command::new("cp")
.arg("-r")
.arg("/var/lib/docker")
.arg(&tmp_docker)
.invoke(crate::ErrorKind::Filesystem)
.await?;
Command::new("systemctl")
.arg("stop")
.arg("docker")
@@ -51,11 +56,13 @@ pub async fn init(cfg: &RpcContextConfig, product_key: &str) -> Result<(), Error
.await?;
tracing::info!("Mounted Docker Data");
crate::install::load_images(cfg.datadir().join(PKG_DOCKER_DIR)).await?;
tracing::info!("Loaded Package Docker Images");
// Loading system images
crate::install::load_images("/var/lib/embassy/system-images").await?;
tracing::info!("Loaded System Docker Images");
if hard_restart {
crate::install::load_images(cfg.datadir().join(PKG_DOCKER_DIR)).await?;
tracing::info!("Loaded Package Docker Images");
// Loading system images
crate::install::load_images("/var/lib/embassy/system-images").await?;
tracing::info!("Loaded System Docker Images");
}
crate::ssh::sync_keys_from_db(&secret_store, "/root/.ssh/authorized_keys").await?;
tracing::info!("Synced SSH Keys");
@@ -96,5 +103,9 @@ pub async fn init(cfg: &RpcContextConfig, product_key: &str) -> Result<(), Error
crate::version::init(&mut handle).await?;
if hard_restart {
tokio::fs::remove_file(HARD_RESTART_PATH).await?;
}
Ok(())
}

1
appmgr/src/lib.rs
View File

@@ -76,6 +76,7 @@ pub fn main_api() -> Result<(), RpcError> {
system::metrics,
shutdown::shutdown,
shutdown::restart,
shutdown::hard_restart,
update::update_system,
marketplace::set_eos_url,
))]

7
appmgr/src/shutdown.rs
View File

@@ -6,6 +6,7 @@ use rpc_toolkit::command;
use crate::context::RpcContext;
use crate::disk::main::export;
use crate::init::HARD_RESTART_PATH;
use crate::sound::SHUTDOWN;
use crate::util::{display_none, Invoke};
use crate::Error;
@@ -108,3 +109,9 @@ pub async fn restart(#[context] ctx: RpcContext) -> Result<(), Error> {
.expect("receiver dropped");
Ok(())
}
#[command(rename = "hard-restart", display(display_none))]
pub async fn hard_restart(#[context] ctx: RpcContext) -> Result<(), Error> {
tokio::fs::write(HARD_RESTART_PATH, b"").await?;
restart(ctx).await
}