Merge pull request #18 from yeazelm/its_all_relative

kubernetes: move dockershim link to relative path
bottlerocket-os · Jun 30, 2024 · e4f9f14 · e4f9f14
2 parents 16107ce + d8b0a44
commit e4f9f14
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/packages/kubernetes-1.23/dockershim-symlink.conf b/packages/kubernetes-1.23/dockershim-symlink.conf
@@ -1,2 +1,2 @@
 [Service]
-ExecStartPre=/bin/ln -sf /run/containerd/containerd.sock /run/dockershim.sock
+ExecStartPre=/bin/ln -sf ./containerd/containerd.sock /run/dockershim.sock
diff --git a/packages/kubernetes-1.24/dockershim-symlink.conf b/packages/kubernetes-1.24/dockershim-symlink.conf
@@ -1,2 +1,2 @@
 [Service]
-ExecStartPre=/bin/ln -sf /run/containerd/containerd.sock /run/dockershim.sock
+ExecStartPre=/bin/ln -sf ./containerd/containerd.sock /run/dockershim.sock
diff --git a/packages/kubernetes-1.25/dockershim-symlink.conf b/packages/kubernetes-1.25/dockershim-symlink.conf
@@ -1,2 +1,2 @@
 [Service]
-ExecStartPre=/bin/ln -sf /run/containerd/containerd.sock /run/dockershim.sock
+ExecStartPre=/bin/ln -sf ./containerd/containerd.sock /run/dockershim.sock
diff --git a/packages/kubernetes-1.26/dockershim-symlink.conf b/packages/kubernetes-1.26/dockershim-symlink.conf
@@ -1,2 +1,2 @@
 [Service]
-ExecStartPre=/bin/ln -sf /run/containerd/containerd.sock /run/dockershim.sock
+ExecStartPre=/bin/ln -sf ./containerd/containerd.sock /run/dockershim.sock
diff --git a/packages/kubernetes-1.27/dockershim-symlink.conf b/packages/kubernetes-1.27/dockershim-symlink.conf
@@ -1,2 +1,2 @@
 [Service]
-ExecStartPre=/bin/ln -sf /run/containerd/containerd.sock /run/dockershim.sock
+ExecStartPre=/bin/ln -sf ./containerd/containerd.sock /run/dockershim.sock
diff --git a/packages/kubernetes-1.28/dockershim-symlink.conf b/packages/kubernetes-1.28/dockershim-symlink.conf
@@ -1,2 +1,2 @@
 [Service]
-ExecStartPre=/bin/ln -sf /run/containerd/containerd.sock /run/dockershim.sock
+ExecStartPre=/bin/ln -sf ./containerd/containerd.sock /run/dockershim.sock
diff --git a/packages/kubernetes-1.29/dockershim-symlink.conf b/packages/kubernetes-1.29/dockershim-symlink.conf
@@ -1,2 +1,2 @@
 [Service]
-ExecStartPre=/bin/ln -sf /run/containerd/containerd.sock /run/dockershim.sock
+ExecStartPre=/bin/ln -sf ./containerd/containerd.sock /run/dockershim.sock
diff --git a/packages/kubernetes-1.30/dockershim-symlink.conf b/packages/kubernetes-1.30/dockershim-symlink.conf
@@ -1,2 +1,2 @@
 [Service]
-ExecStartPre=/bin/ln -sf /run/containerd/containerd.sock /run/dockershim.sock
+ExecStartPre=/bin/ln -sf ./containerd/containerd.sock /run/dockershim.sock