From 5f7dcd2a1687d28ee5cb28e274d23acf57f760fc Mon Sep 17 00:00:00 2001 From: Danny Canter Date: Fri, 25 Jul 2025 09:43:48 -0700 Subject: [PATCH] Vminitd: Remove special cased /run mount (#233) Revisiting this, I'm not a huge fan of having /run be special cased for some reason --- Sources/Containerization/Agent/Vminitd.swift | 2 ++ vminitd/Sources/vminitd/Application.swift | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Sources/Containerization/Agent/Vminitd.swift b/Sources/Containerization/Agent/Vminitd.swift index 53db0c59..6e4f2fe6 100644 --- a/Sources/Containerization/Agent/Vminitd.swift +++ b/Sources/Containerization/Agent/Vminitd.swift @@ -56,6 +56,8 @@ extension Vminitd: VirtualMachineAgent { try await setenv(key: "PATH", value: Self.defaultPath) let mounts: [ContainerizationOCI.Mount] = [ + // NOTE: /proc is always done implicitly by the guest agent. + .init(type: "tmpfs", source: "tmpfs", destination: "/run"), .init(type: "sysfs", source: "sysfs", destination: "/sys"), .init(type: "tmpfs", source: "tmpfs", destination: "/tmp"), .init(type: "devpts", source: "devpts", destination: "/dev/pts", options: ["gid=5", "mode=620", "ptmxmode=666"]), diff --git a/vminitd/Sources/vminitd/Application.swift b/vminitd/Sources/vminitd/Application.swift index 24539a7c..1f8e06dd 100644 --- a/vminitd/Sources/vminitd/Application.swift +++ b/vminitd/Sources/vminitd/Application.swift @@ -99,10 +99,7 @@ struct Application { log.error("failed to mount /proc") exit(1) } - guard Musl.mount("tmpfs", "/run", "tmpfs", 0, "") == 0 else { - log.error("failed to mount /run") - exit(1) - } + try Binfmt.mount() log.logLevel = .debug