Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions crates/sandbox2/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -399,15 +399,19 @@ impl<C: Channel> Sandbox<C> {
container.hostname(hn);
}
if let Some(s) = &self.config.cpu_weight {
container.cgroups_resources({
let mut resources = hakoniwa::cgroups::Resources::default();
resources.cpu({
let mut cpu = hakoniwa::cgroups::Cpu::default();
cpu.shares(*s);
cpu
if systemd_probably_works() {
container.cgroups_resources({
let mut resources = hakoniwa::cgroups::Resources::default();
resources.cpu({
let mut cpu = hakoniwa::cgroups::Cpu::default();
cpu.shares(*s);
cpu
});
resources
});
resources
});
} else {
tracing::debug!("Not configuring cgroups: systemd probably not available");
}
}

Ok(Container { container })
Expand Down Expand Up @@ -736,3 +740,13 @@ impl Sandbox {
fn hardlink_dir_contents(src_dir: &Path, dst_parent_dir: &Path) -> Result<(), Error> {
common::hardlink_dir_contents(src_dir, dst_parent_dir).map_err(Error::HardlinkFailed)
}

fn systemd_probably_works() -> bool {
if std::env::var("DBUS_SESSION_BUS_ADDRESS").is_ok() {
return true;
}
if let Ok(dir) = std::env::var("XDG_RUNTIME_DIR") {
return std::fs::metadata(PathBuf::from(dir).join("bus")).is_ok();
}
false
}