From ae3e2888a9f3ada3d7b8d35cf3240642e5759beb Mon Sep 17 00:00:00 2001 From: pvizeli Date: Tue, 28 Mar 2017 15:38:07 +0200 Subject: [PATCH] Fix scripts --- .../start-resin-supervisor | 2 +- .../hassio-host-controll/hassio-hc | 12 ++++++------ .../hassio-host-controll/hassio-hc.service | 2 +- supervisor/README.md | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/start-resin-supervisor b/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/start-resin-supervisor index c4fb76b9a..8bd55ba79 100644 --- a/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/start-resin-supervisor +++ b/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/start-resin-supervisor @@ -10,7 +10,7 @@ runSupervisor() { docker rm --force resin_supervisor || true docker run --privileged --name resin_supervisor \ -v /var/run/docker.sock:/var/run/docker.sock \ - -v /var/run/hassio_hc.sock:/var/run/hassio-hc.sock \ + -v /var/run/hassio-hc.sock:/var/run/hassio-hc.sock \ -v /resin-data:/data \ -v /var/log/supervisor-log:/var/log \ -e DOCKER_SOCKET=/var/run/docker.sock \ diff --git a/meta-hassio/recipes-support/hassio-host-controll/hassio-host-controll/hassio-hc b/meta-hassio/recipes-support/hassio-host-controll/hassio-host-controll/hassio-hc index f6fa848e8..11c959559 100644 --- a/meta-hassio/recipes-support/hassio-host-controll/hassio-host-controll/hassio-hc +++ b/meta-hassio/recipes-support/hassio-host-controll/hassio-host-controll/hassio-hc @@ -21,29 +21,29 @@ do continue fi if [ ${parse[0]} == "reboot" ]; then - systemctl reboot + systemctl reboot || true echo "OK" continue fi if [ ${parse[0]} == "shutdown" ]; then - systemctl poweroff + systemctl poweroff || true echo "OK" continue fi if [ ${parse[0]} == "host-update" ]; then if [ ${parse[@]} -eq 2]; then - resinhub --hostos-version ${parse[1]} + resinhub --hostos-version ${parse[1]} || true else - resinhub + resinhub || true fi echo "OK" continue fi if [ ${parse[0]} == "supevisor-update" ]; then if [ ${parse[@]} -eq 2]; then - update-resin-supervisor --supervisor-tag ${parse[1]} + update-resin-supervisor --supervisor-tag ${parse[1]} || true else - update-resin-supervisor + update-resin-supervisor || true fi echo "OK" continue diff --git a/meta-hassio/recipes-support/hassio-host-controll/hassio-host-controll/hassio-hc.service b/meta-hassio/recipes-support/hassio-host-controll/hassio-host-controll/hassio-hc.service index c37af0288..40c7db685 100644 --- a/meta-hassio/recipes-support/hassio-host-controll/hassio-host-controll/hassio-hc.service +++ b/meta-hassio/recipes-support/hassio-host-controll/hassio-host-controll/hassio-hc.service @@ -5,7 +5,7 @@ Before=resin-supervisor.service [Service] Type=simple -ExecStart=@BINDIR@/socat UNIX:/var/run/hassio-hc.sock,fork EXEC:@BINDIR@/hassio-hc +ExecStart=@BINDIR@/socat UNIX-LISTEN:/var/run/hassio-hc.sock,fork EXEC:@BINDIR@/hassio-hc [Install] WantedBy=resin.target diff --git a/supervisor/README.md b/supervisor/README.md index 322fa3679..2660d799d 100644 --- a/supervisor/README.md +++ b/supervisor/README.md @@ -10,7 +10,7 @@ ```bash docker run --privileged --name resin_supervisor \ -v /var/run/docker.sock:/var/run/docker.sock \ - -v /var/run/hassio_hc.sock:/var/run/hassio-hc.sock \ + -v /var/run/hassio-hc.sock:/var/run/hassio-hc.sock \ -v /resin-data:/data \ -v /var/log/supervisor-log:/var/log \ -e DOCKER_SOCKET=/var/run/docker.sock \