move ownership of image compilation to controller

This commit is contained in:
Alex Zenla
2024-01-17 14:33:20 -08:00
parent 198ca3ff80
commit 9c438e8e57
2 changed files with 15 additions and 8 deletions

View File

@ -1,8 +1,6 @@
use clap::Parser;
use hypha::ctl::Controller;
use hypha::error::Result;
use hypha::image::ImageCompiler;
use ocipkg::ImageName;
#[derive(Parser, Debug)]
#[command(version, about)]
@ -27,12 +25,9 @@ fn main() -> Result<()> {
env_logger::init();
let args = ControllerArgs::parse();
let mut controller = Controller::new(args.kernel, args.initrd, args.cpus, args.mem)?;
let image = ImageName::parse(args.image.as_str())?;
let compiler = ImageCompiler::new()?;
let squashfs = compiler.compile(&image)?;
println!("packed image into squashfs: {}", &squashfs);
let mut controller =
Controller::new(args.kernel, args.initrd, args.image, args.cpus, args.mem)?;
controller.compile()?;
let domid = controller.launch()?;
println!("launched domain: {}", domid);
Ok(())