From 8025fa0457da309aa21649ca7aecc4e1ea002207 Mon Sep 17 00:00:00 2001 From: Jacek Tomasiak Date: Thu, 16 Jan 2025 09:41:00 +0100 Subject: [PATCH] agent: Don't pass empty options to mount With some older kernels some fs implementations don't handle empty options strings well. This leads to failures in "setup rootfs" step. E.g. `cgroup: cgroup2: unknown option ""`. This is fixed by mapping empty string to `None` before passing to `nix::mount`. Signed-off-by: Jacek Tomasiak Signed-off-by: Jacek Tomasiak --- src/agent/rustjail/src/mount.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/agent/rustjail/src/mount.rs b/src/agent/rustjail/src/mount.rs index c97cbec4f9..9ebb3e94aa 100644 --- a/src/agent/rustjail/src/mount.rs +++ b/src/agent/rustjail/src/mount.rs @@ -857,7 +857,7 @@ fn mount_from( dest.as_str(), Some(mount_typ.as_str()), flags, - Some(d.as_str()), + Some(d.as_str()).filter(|s| !s.is_empty()), ) .inspect_err(|e| log_child!(cfd_log, "mount error: {:?}", e))?;