Add v1.20.2+k3s1 and logging wrapper

2021-02-01 18:20:34 +01:00 · 2021-02-01 18:20:34 +01:00 · 24b32def1e
parent 307597eae6
commit 24b32def1e
3 changed files with 7 additions and 1 deletions
--- a/1
+++ b/1
@ -1,3 +1,4 @@
+1.20.2+k3s1
 1.18.10+k3s1
 1.17.4+k3s1
 0.9.1
--- a/files/etc/init.d/k3s
+++ b/files/etc/init.d/k3s
@ -4,7 +4,7 @@ START=60
 STOP=20

 PIDFILE=/var/run/k3s.pid
-EXEC="/usr/bin/k3s"
+EXEC="/usr/bin/k3s-wrapper"

 ensure_cgroup_mount() {
  # Unmount /sys/fs/cgroup if mounted as cgroup
--- a/files/usr/bin/k3s-wrapper
+++ b/files/usr/bin/k3s-wrapper
@ -0,0 +1,5 @@
+#!/bin/sh
+k3s "$@" 2>&1 | logger -t k3s &
+PID="$!"
+
+trap "kill $PID; wait $PID"