From 54be4048f0bdd4cbf36bde5adcf1f07e1c296d5e Mon Sep 17 00:00:00 2001
From: Avi Deitcher <avi@deitcher.net>
Date: Mon, 19 Oct 2020 17:26:25 +0300
Subject: [PATCH] fix reversed equals error

Signed-off-by: Avi Deitcher <avi@deitcher.net>
---
 pkg/init/cmd/service/system_init.go           |  2 +-
 .../040_packages/020_init_containerd/check.sh | 13 +++++++++
 .../040_packages/020_init_containerd/test.sh  | 24 ++++++++++++++++
 .../040_packages/020_init_containerd/test.yml | 28 +++++++++++++++++++
 4 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 test/cases/040_packages/020_init_containerd/check.sh
 create mode 100644 test/cases/040_packages/020_init_containerd/test.sh
 create mode 100644 test/cases/040_packages/020_init_containerd/test.yml

diff --git a/pkg/init/cmd/service/system_init.go b/pkg/init/cmd/service/system_init.go
index 21670b78b..58a404524 100644
--- a/pkg/init/cmd/service/system_init.go
+++ b/pkg/init/cmd/service/system_init.go
@@ -85,7 +85,7 @@ func systemInitCmd(ctx context.Context, args []string) {
 
 	// look for containerd options
 	ctrdArgs := []string{}
-	if b, err := ioutil.ReadFile(containerdOptsFile); err != nil {
+	if b, err := ioutil.ReadFile(containerdOptsFile); err == nil {
 		ctrdArgs = strings.Fields(string(b))
 	}
 
diff --git a/test/cases/040_packages/020_init_containerd/check.sh b/test/cases/040_packages/020_init_containerd/check.sh
new file mode 100644
index 000000000..9e62043e2
--- /dev/null
+++ b/test/cases/040_packages/020_init_containerd/check.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+function failed {
+	printf "containerd commandline vars not set: FAILED\n" >/dev/console
+	/sbin/poweroff -f
+	exit 1
+}
+
+ps -ef | grep containerd | grep -q trace || failed
+
+printf "containerd commandline vars test suite PASSED\n" >/dev/console
+
+/sbin/poweroff -f
diff --git a/test/cases/040_packages/020_init_containerd/test.sh b/test/cases/040_packages/020_init_containerd/test.sh
new file mode 100644
index 000000000..46203e684
--- /dev/null
+++ b/test/cases/040_packages/020_init_containerd/test.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+# SUMMARY: Check that the containerd command-line options have been enabled by init
+# LABELS:
+# REPEAT:
+
+set -e
+
+# Source libraries. Uncomment if needed/defined
+#. "${RT_LIB}"
+. "${RT_PROJECT_ROOT}/_lib/lib.sh"
+NAME=init_containerd
+
+clean_up() {
+	rm -rf ${NAME}-*
+}
+trap clean_up EXIT
+
+# Test code goes here
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run $NAME)"
+echo "${RESULT}"
+echo "${RESULT}" | grep -q "suite PASSED"
+
+exit 0
diff --git a/test/cases/040_packages/020_init_containerd/test.yml b/test/cases/040_packages/020_init_containerd/test.yml
new file mode 100644
index 000000000..adb612cbd
--- /dev/null
+++ b/test/cases/040_packages/020_init_containerd/test.yml
@@ -0,0 +1,28 @@
+kernel:
+  image: linuxkit/kernel:5.4.39
+  cmdline: "console=ttyS0 console=ttyAMA0"
+init:
+  - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a
+  - linuxkit/runc:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
+  - linuxkit/ca-certificates:v0.8
+services:
+  - name: test
+    image: alpine:3.11
+    pid: host
+    binds:
+      - /check.sh:/check.sh
+      - /dev/console:/dev/console
+    capabilities:
+      - CAP_SYS_BOOT
+    command: ["sh", "/check.sh"]
+files:
+  - path: check.sh
+    source: ./check.sh
+  - path: /etc/containerd/cli-opts
+    contents: "--log-level trace"
+trust:
+  org:
+    - linuxkit
+  image:
+    - alpine:3.11