From 769083f61b7015972a7d09ad56500d05bd947395 Mon Sep 17 00:00:00 2001
From: John Logan <john_logan@apple.com>
Date: Mon, 19 Jan 2026 01:08:33 -0800
Subject: [PATCH 1/2] Devcontainer for vminitd development.

---
 vminitd/.devcontainer/Dockerfile        |  7 +++++++
 vminitd/.devcontainer/devcontainer.json | 22 ++++++++++++++++++++++
 vminitd/Makefile                        |  3 +++
 3 files changed, 32 insertions(+)
 create mode 100644 vminitd/.devcontainer/Dockerfile
 create mode 100644 vminitd/.devcontainer/devcontainer.json

diff --git a/vminitd/.devcontainer/Dockerfile b/vminitd/.devcontainer/Dockerfile
new file mode 100644
index 00000000..92cf57c0
--- /dev/null
+++ b/vminitd/.devcontainer/Dockerfile
@@ -0,0 +1,7 @@
+FROM swift:6.2
+
+RUN apt-get update \
+&&  apt-get install make \
+&&  apt-get clean \
+&&  rm -rf /var/lib/apt/lists/*
+RUN swift sdk install https://download.swift.org/swift-6.2.3-release/static-sdk/swift-6.2.3-RELEASE/swift-6.2.3-RELEASE_static-linux-0.0.1.artifactbundle.tar.gz --checksum f30ec724d824ef43b5546e02ca06a8682dafab4b26a99fbb0e858c347e507a2c
diff --git a/vminitd/.devcontainer/devcontainer.json b/vminitd/.devcontainer/devcontainer.json
new file mode 100644
index 00000000..ded64c62
--- /dev/null
+++ b/vminitd/.devcontainer/devcontainer.json
@@ -0,0 +1,22 @@
+{
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "features": {},
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "redhat.vscode-yaml",
+                "swiftlang.swift-vscode",
+                "llvm-vs-code-extensions.lldb-dap",
+                "vadimcn.vscode-lldb"
+            ],
+            "settings": {
+                "swift.debugger.path": "/usr/bin/lldb-dap",
+                "swift.path": "/usr/bin"
+            }
+        }
+    },
+    "runArgs": [],
+    "mounts": []
+}
diff --git a/vminitd/Makefile b/vminitd/Makefile
index 3773e7a3..53892acf 100644
--- a/vminitd/Makefile
+++ b/vminitd/Makefile
@@ -26,9 +26,12 @@ SWIFTLY_FILENAME := $(notdir $(SWIFTLY_URL))
 SWIFTLY_BIN_DIR ?= ~/.swiftly/bin
 BUILD_BIN_DIR := $(shell swift build -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --show-bin-path)
 
+SYSTEM_TYPE := $(shell uname -s)
+ifeq ($(SYSTEM_TYPE),Darwin)
 MACOS_VERSION := $(shell sw_vers -productVersion)
 MACOS_MAJOR := $(shell echo $(MACOS_VERSION) | cut -d. -f1)
 MACOS_RELEASE_TYPE := $(shell sw_vers | grep ReleaseType)
+endif
 
 .DEFAULT_GOAL := all
 

From 923f1f90bb2ecfd7b78d04ee605af793fdbff6db Mon Sep 17 00:00:00 2001
From: John Logan <john_logan@apple.com>
Date: Tue, 20 Jan 2026 18:38:48 -0800
Subject: [PATCH 2/2] Remove unneeded extensions.

---
 vminitd/.devcontainer/devcontainer.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/vminitd/.devcontainer/devcontainer.json b/vminitd/.devcontainer/devcontainer.json
index ded64c62..f46c6139 100644
--- a/vminitd/.devcontainer/devcontainer.json
+++ b/vminitd/.devcontainer/devcontainer.json
@@ -6,14 +6,9 @@
     "customizations": {
         "vscode": {
             "extensions": [
-                "redhat.vscode-yaml",
-                "swiftlang.swift-vscode",
-                "llvm-vs-code-extensions.lldb-dap",
-                "vadimcn.vscode-lldb"
+                "swiftlang.swift-vscode"
             ],
             "settings": {
-                "swift.debugger.path": "/usr/bin/lldb-dap",
-                "swift.path": "/usr/bin"
             }
         }
     },