tobru/k3s-openwrt
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix cgroup tmpfs mount, drop hardcoded --no-deploy

Browse source
This commit is contained in:
Johannes 'fish' Ziemke 2019-04-28 11:42:06 +02:00
parent 3fd180e7d4
commit 1571b87e48
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
files/etc/init.d/k3s
View file

@ -10,7 +10,9 @@ ensure_cgroup_mount() {
# Unmount /sys/fs/cgroup if mounted as cgroup
grep ' /sys/fs/cgroup cgroup' /proc/self/mounts && umount /sys/fs/cgroup
mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
grep ' /sys/fs/cgroup tmpfs' /proc/self/mounts \
|| mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
mnt="/sys/fs/cgroup/$sys"
grep -q "cgroup $mnt " /proc/self/mounts && continue
@ -22,7 +24,7 @@ ensure_cgroup_mount() {
start() {
ensure_cgroup_mount
start-stop-daemon -S -b -x "$EXEC" -m -p "$PIDFILE" \
-- server $(uci_get k3s.globals.opts) --no-deploy traefik \
-- server $(uci_get k3s.globals.opts) \
--data-dir $(uci_get k3s.globals.root)
}