From 52758326385b4ca0fdbb181316bf838d0c0b8d99 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Thu, 10 Feb 2022 19:56:22 +0100 Subject: [PATCH] feat: service control adds a small script which will always start/stop/restart simulavr together with klipper restarting klipper often resulted in a failed mcu reset error, this is an attempt to fix that --- docker/Dockerfile | 1 + docker/service_control.sh | 7 +++++++ docker/start.sh | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 docker/service_control.sh diff --git a/docker/Dockerfile b/docker/Dockerfile index f075ebd..b26fc0f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -46,6 +46,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ### copy all required files COPY simulavr.config /usr/src COPY supervisord.conf /etc/supervisor/supervisord.conf +COPY service_control.sh /bin/service_control COPY start.sh /bin/start ### make entrypoint executable diff --git a/docker/service_control.sh b/docker/service_control.sh new file mode 100644 index 0000000..fe7657c --- /dev/null +++ b/docker/service_control.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ "$2" = "klipper" ]; then + sudo /usr/bin/supervisorctl "$1" simulavr "$2" +else + sudo /usr/bin/supervisorctl "$1" "$2" +fi diff --git a/docker/start.sh b/docker/start.sh index 8938ab3..9e8af37 100644 --- a/docker/start.sh +++ b/docker/start.sh @@ -79,7 +79,7 @@ setup_simulavr build_simulavr sudo -S rm /bin/systemctl -sudo -S ln -s /usr/bin/supervisorctl /bin/systemctl +sudo -S ln -s /bin/service_control /bin/systemctl cd ~ && echo "Everything is ready ... Starting ..." /usr/bin/supervisord \ No newline at end of file