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

parent 792c8b2c63

Browse Source 
author Lucy Cifferello <12953208+elvece@users.noreply.github.com> 1633389065 -0600
committer Lucy Cifferello <12953208+elvece@users.noreply.github.com> 1633392210 -0600
gpgsig -----BEGIN PGP SIGNATURE-----

 iQIzBAABCAAdFiEE3X0bBKW79BqaYR/F8FBkfE2sxvMFAmFbllIACgkQ8FBkfE2s
 xvOMxQ/9GA3sBp0dH3X2Gm0Rao0pdBppNx0sYbNfliQulP0n62fzoSFJ2fKkwDOj
 IpcvL7R6lVqO58JD04GSTCfnpSJCKC3YtbgQ5kNhKbZLupLONrdbmk4DZp2hp2ng
 +6Q6e0soPcXbzm1Q63ovCasrQwEMmePEMq1WI4aeCuQhtVJz0D8uWy5kkiF1gNT0
 29jqQQJsMtr2bG1OrHfg+f8ZPBYYsH+cW2LEUyR7sIIAWVAZYn0KYQQb6n+7tYv+
 +dNRCx+k6BW7NX1df7HK3yhN7zr1oR1ETrojShFjA6i4rbCM1fgfX3Gfchu8SiKQ
 FTtZ1nIqVo8NvK6dM2ut6GBB5TdFE3tG3a/xhSnBwSXHcgyTD2vMO0yHJe2Uizq2
 3dylgnEcFQPTZZmQWvW5Vh95fhgGd8KhH10NWnbWotTtOvDsTe6abNZfkSat6S1J
 SDK0jI1CxDyj3m1CCSbmCyMMEXqAUDlVq9AFbQEAIsr80plBrKg28Z9Y4/Qs/u4x
 5LKqPu9479uQfDdJixFUKG6eSRowMhjBYaV7ylfExm6BDjBuzEPVcj5sC65WoKNb
 3an7+jQK5gb7IeGzzEWw4+DmmMKVv+mM2FOA0eCCR7xFQne72CDxaAepAKi3FxuS
 OsorndhT+nWzP388Selj+D3B077XIMErSZKEl4gGtOXqIDbmi6Y=
 =LuAW
 -----END PGP SIGNATURE-----

fix rpc context argument for embassy init

fix rpc context argument for embassy init

pass in datadir rather than entire rpc context

fix config path reference

fix merge conflict

cleanup imports

fix reference convention

remove uneeded import
This commit is contained in:
Lucy Cifferello
2021-10-04 17:11:05 -06:00
committed by Aiden McClelland
parent d33e74214b
commit c931a922fb
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
appmgr/src/bin/embassy-init.rs
View File

@@ -114,7 +114,7 @@ async fn init(cfg_path: Option<&str>) -> Result<(), Error> {
.invoke(embassy::ErrorKind::Docker)
.await?;
log::info!("Mounted Docker Data");
embassy::install::load_images().await?;
embassy::install::load_images(cfg.datadir()).await?;
log::info!("Loaded Docker Images");
embassy::ssh::sync_keys_from_db(&secret_store, "/root/.ssh/authorized_keys").await?;
log::info!("Synced SSH Keys");
@@ -241,7 +241,6 @@ fn main() {
_ => log::LevelFilter::Trace,
});
let cfg_path = matches.value_of("config");
let res = {
let rt = tokio::runtime::Builder::new_multi_thread()
.enable_all()

4
appmgr/src/install/mod.rs
View File

@@ -714,8 +714,8 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
Ok(())
}
pub async fn load_images(ctx: RpcContext) -> Result<(), Error> {
let docker_dir = ctx.datadir.join(PKG_DOCKER_DIR);
pub async fn load_images<P: AsRef<Path>>(datadir: P) -> Result<(), Error> {
let docker_dir = datadir.as_ref().join(PKG_DOCKER_DIR);
if tokio::fs::metadata(&docker_dir).await.is_ok() {
ReadDirStream::new(tokio::fs::read_dir(&docker_dir).await?)
.map_err(|e| {