From 24b32def1e3490a82624792363e19f1c7003c7ed Mon Sep 17 00:00:00 2001 From: Johannes 'fish' Ziemke Date: Mon, 1 Feb 2021 18:20:34 +0100 Subject: [PATCH] Add v1.20.2+k3s1 and logging wrapper --- VERSIONS | 1 + files/etc/init.d/k3s | 2 +- files/usr/bin/k3s-wrapper | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100755 files/usr/bin/k3s-wrapper diff --git a/VERSIONS b/VERSIONS index 10328ba..f318798 100644 --- a/VERSIONS +++ b/VERSIONS @@ -1,3 +1,4 @@ +1.20.2+k3s1 1.18.10+k3s1 1.17.4+k3s1 0.9.1 diff --git a/files/etc/init.d/k3s b/files/etc/init.d/k3s index 4e148ef..f74e3b1 100755 --- 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 diff --git a/files/usr/bin/k3s-wrapper b/files/usr/bin/k3s-wrapper new file mode 100755 index 0000000..47fedad --- /dev/null +++ b/files/usr/bin/k3s-wrapper @@ -0,0 +1,5 @@ +#!/bin/sh +k3s "$@" 2>&1 | logger -t k3s & +PID="$!" + +trap "kill $PID; wait $PID"