Skip to content

Commit 689a803

Browse files
committed
fix: don't re-enable already-enabled units -- Quadlet generated units reject a second enable
In the systemd 262 + podman 6 combo, enabling a Quadlet generated unit errors out ("transient or generated"), while is-enabled clearly reports generated. Ask the state first: skip already enabled/generated/enabled-runtime units (a no-op anyway), otherwise enable, and still fail loud on errors.
1 parent adb71a2 commit 689a803

1 file changed

Lines changed: 32 additions & 2 deletions

File tree

‎bin/shellflow/src/host.rs‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,18 @@ fn service(args: &HostServiceArgs) -> Result<(), HostError> {
143143
run_systemctl(&["daemon-reload"])?;
144144

145145
if args.enable {
146-
run_systemctl(&["enable", &unit])?;
147-
println!("==> enabled {unit}");
146+
// A Quadlet container's unit is generated: `enable` refuses it
147+
// ("transient or generated") while reporting it as enabled. Enabling
148+
// what is already enabled is a no-op everywhere else, so ask first.
149+
match unit_enabled_state(&unit)?.as_str() {
150+
"enabled" | "enabled-runtime" | "generated" => {
151+
println!("==> {unit} is already enabled");
152+
}
153+
_ => {
154+
run_systemctl(&["enable", &unit])?;
155+
println!("==> enabled {unit}");
156+
}
157+
}
148158
}
149159

150160
if args.reload {
@@ -248,6 +258,26 @@ fn is_a_missing_file(line: &str) -> bool {
248258
line.trim().is_empty()
249259
}
250260

261+
/// How the unit is enabled (`enabled`, `disabled`, `generated`, ...).
262+
///
263+
/// An unreadable state is reported as empty: the caller decides.
264+
fn unit_enabled_state(unit: &str) -> Result<String, HostError> {
265+
let out = systemctl_output(&["is-enabled", unit])
266+
.map_err(|err| HostError::internal(format!("cannot run `systemctl is-enabled`: {err}")))?;
267+
if out.status.success() {
268+
return Ok(String::from_utf8_lossy(&out.stdout).trim().to_string());
269+
}
270+
let stderr = String::from_utf8_lossy(&out.stderr);
271+
let stdout = String::from_utf8_lossy(&out.stdout);
272+
let detail = if stderr.trim().is_empty() { stdout.trim() } else { stderr.trim() };
273+
// A unit systemd has never heard of is not enabled; anything else the
274+
// caller handles.
275+
if detail.contains("No such file or directory") || detail.contains("not found") {
276+
return Ok("missing".to_string());
277+
}
278+
Err(HostError::failed(format!("`systemctl is-enabled {unit}` failed: {detail}")))
279+
}
280+
251281
/// The unit's activation state (`active`, `inactive`, `failed`, ...).
252282
///
253283
/// An empty string means the state could not be read at all.

0 commit comments

Comments
 (0)