From 7b86e60c812edb14e148d877094e38c53a5c67a8 Mon Sep 17 00:00:00 2001 From: Neil Kollack Date: Mon, 28 Feb 2022 13:59:44 -0600 Subject: fix: make requested changes --- zone_nspawn/src/container.rs | 10 ++++++++++ zone_nspawn/src/nspawn.rs | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'zone_nspawn/src') diff --git a/zone_nspawn/src/container.rs b/zone_nspawn/src/container.rs index f7fa37a..552c180 100644 --- a/zone_nspawn/src/container.rs +++ b/zone_nspawn/src/container.rs @@ -65,6 +65,16 @@ impl Container { Ok(()) } + pub fn shutdown(&self) -> Result<()> { + Command::new("machinectl") + .arg("poweroff") + .arg(&self.machine) + .status()? + .success() + .then(|| ()) + .ok_or_else(|| Error::NSpawn(format!("Failed to shutdown container: {:?}", self))) + } + pub fn builder() -> ContainerBuilder { ContainerBuilder::default() } diff --git a/zone_nspawn/src/nspawn.rs b/zone_nspawn/src/nspawn.rs index 1e22ec1..bf58303 100644 --- a/zone_nspawn/src/nspawn.rs +++ b/zone_nspawn/src/nspawn.rs @@ -26,14 +26,4 @@ impl NSpawn { .map(|o| serde_json::from_slice(o.stdout.as_slice()))? .map_err(Error::from) } - - pub fn shutdown_container(&self, container: &Container) -> Result<()> { - Command::new("machinectl") - .arg("poweroff") - .arg(&container.machine) - .status()? - .success() - .then(|| ()) - .ok_or_else(|| Error::NSpawn(format!("Failed to shutdown container: {:?}", self))) - } } -- cgit v1.2.3-70-g09d2