From 4a5692cbb29ed219e1c12f3d9174b6dbf91a6478 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Thu, 13 Aug 2020 11:25:20 +0200
Subject: [PATCH] Use new machine flag (#102)

---
 files/hassio-supervisor | 7 ++++---
 installer.sh            | 9 ++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/files/hassio-supervisor b/files/hassio-supervisor
index 4e83324..8a31502 100644
--- a/files/hassio-supervisor
+++ b/files/hassio-supervisor
@@ -5,7 +5,7 @@ set -e
 CONFIG_FILE=%%HASSIO_CONFIG%%
 
 SUPERVISOR="$(jq --raw-output '.supervisor' ${CONFIG_FILE})"
-HOMEASSISTANT="$(jq --raw-output '.homeassistant' ${CONFIG_FILE})"
+MACHINE="$(jq --raw-output '.machine' ${CONFIG_FILE})"
 DATA="$(jq --raw-output '.data // "/usr/share/hassio"' ${CONFIG_FILE})"
 
 # AppArmor Support
@@ -30,10 +30,11 @@ runSupervisor() {
         --security-opt seccomp=unconfined \
         -v /run/docker.sock:/run/docker.sock \
         -v /run/dbus:/run/dbus \
-        -v "${HASSIO_DATA}":/data \
+        -v /etc/machine-id:/etc/machine-id:ro \
+        -v "${HASSIO_DATA}":/data:rw \
         -e SUPERVISOR_SHARE="${HASSIO_DATA}" \
         -e SUPERVISOR_NAME=hassio_supervisor \
-        -e HOMEASSISTANT_REPOSITORY="${HOMEASSISTANT}" \
+        -e SUPERVISOR_MACHINE="${MACHINE}" \
         "${SUPERVISOR}"
 }
 
diff --git a/installer.sh b/installer.sh
index 5f927f7..8357bfb 100644
--- a/installer.sh
+++ b/installer.sh
@@ -83,33 +83,28 @@ CONFIG=$SYSCONFDIR/hassio.json
 case $ARCH in
     "i386" | "i686")
         MACHINE=${MACHINE:=qemux86}
-        HOMEASSISTANT_DOCKER="$DOCKER_REPO/$MACHINE-homeassistant"
         HASSIO_DOCKER="$DOCKER_REPO/i386-hassio-supervisor"
     ;;
     "x86_64")
         MACHINE=${MACHINE:=qemux86-64}
-        HOMEASSISTANT_DOCKER="$DOCKER_REPO/$MACHINE-homeassistant"
         HASSIO_DOCKER="$DOCKER_REPO/amd64-hassio-supervisor"
     ;;
     "arm" |"armv6l")
         if [ -z $MACHINE ]; then
             error "Please set machine for $ARCH"
         fi
-        HOMEASSISTANT_DOCKER="$DOCKER_REPO/$MACHINE-homeassistant"
         HASSIO_DOCKER="$DOCKER_REPO/armhf-hassio-supervisor"
     ;;
     "armv7l")
         if [ -z $MACHINE ]; then
             error "Please set machine for $ARCH"
         fi
-        HOMEASSISTANT_DOCKER="$DOCKER_REPO/$MACHINE-homeassistant"
         HASSIO_DOCKER="$DOCKER_REPO/armv7-hassio-supervisor"
     ;;
     "aarch64")
         if [ -z $MACHINE ]; then
             error "Please set machine for $ARCH"
         fi
-        HOMEASSISTANT_DOCKER="$DOCKER_REPO/$MACHINE-homeassistant"
         HASSIO_DOCKER="$DOCKER_REPO/aarch64-hassio-supervisor"
     ;;
     *)
@@ -140,7 +135,7 @@ HASSIO_VERSION=$(curl -s $URL_VERSION | jq -e -r '.supervisor')
 cat > "$CONFIG" <<- EOF
 {
     "supervisor": "${HASSIO_DOCKER}",
-    "homeassistant": "${HOMEASSISTANT_DOCKER}",
+    "machine": "${MACHINE}",
     "data": "${DATA_SHARE}"
 }
 EOF
@@ -187,7 +182,7 @@ fi
 
 ##
 # Init system
-echo "[Info] Run Hass.io"
+echo "[Info] Run Home Assistant Supervised"
 systemctl start hassio-supervisor.service
 
 ##