From 904d20bba2dadaa5d4fa820451e2b428c6d55fc2 Mon Sep 17 00:00:00 2001
From: safiya2610 <lci2023053@iiitl.ac.in>
Date: Wed, 12 Aug 2026 03:24:59 +0530
Subject: [PATCH 1/2] fix(unikontainers): propagate actual errors instead of
 masking them behind ErrNotUnikernel

Signed-off-by: safiya2610 <lci2023053@iiitl.ac.in>
---
 pkg/unikontainers/unikontainers.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/unikontainers/unikontainers.go b/pkg/unikontainers/unikontainers.go
index ad0bf2897..99e09006f 100644
--- a/pkg/unikontainers/unikontainers.go
+++ b/pkg/unikontainers/unikontainers.go
@@ -87,7 +87,10 @@ func New(bundlePath string, containerID string, rootDir string, cfg *UruncConfig
 
 	config, err := GetUnikernelConfig(bundlePath, spec)
 	if err != nil {
-		return nil, ErrNotUnikernel
+		if errors.Is(err, os.ErrNotExist) {
+			return nil, ErrNotUnikernel
+		}
+		return nil, err
 	}
 
 	confMap := config.Map()

From 663f4f8d63cbeb998c7001a4c1cfd71588b22aa2 Mon Sep 17 00:00:00 2001
From: safiya2610 <lci2023053@iiitl.ac.in>
Date: Sun, 16 Aug 2026 15:36:03 +0530
Subject: [PATCH 2/2] ci: fix CNI initialization in e2e tests

---
 .github/workflows/vm_test.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/.github/workflows/vm_test.yml b/.github/workflows/vm_test.yml
index 446de3723..abdae50e4 100644
--- a/.github/workflows/vm_test.yml
+++ b/.github/workflows/vm_test.yml
@@ -197,6 +197,37 @@ jobs:
         sudo mkdir -p /opt/cni/bin
         sudo tar Cxzvf /opt/cni/bin "cni-plugins-linux-$(dpkg --print-architecture)-v${SAFE_CNI}.tgz"
         rm -f "cni-plugins-linux-$(dpkg --print-architecture)-v${SAFE_CNI}.tgz"
+        sudo mkdir -p /etc/cni/net.d
+        sudo tee /etc/cni/net.d/10-containerd-net.conflist > /dev/null <<'EOF'
+{
+  "cniVersion": "1.0.0",
+  "name": "containerd-net",
+  "plugins": [
+    {
+      "type": "bridge",
+      "bridge": "cni0",
+      "isGateway": true,
+      "ipMasq": true,
+      "promiscMode": true,
+      "ipam": {
+        "type": "host-local",
+        "ranges": [
+          [{
+            "subnet": "10.88.0.0/16"
+          }]
+        ],
+        "routes": [
+          { "dst": "0.0.0.0/0" }
+        ]
+      }
+    },
+    {
+      "type": "portmap",
+      "capabilities": {"portMappings": true}
+    }
+  ]
+}
+EOF
 
     - name: Install nerdctl
       env: