From 7d4b424d2f640ee341d20073b0ddbdcb5c794b81 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Sun, 1 Jul 2018 15:15:54 +0200
Subject: [PATCH] Map /etc/machine-id into supervisor/cli (#60)

* Map /etc/machine-id into supervisor/cli

* Update hassos-cli

* Update hassos-supervisor
---
 buildroot-external/rootfs-overlay/usr/sbin/hassos-cli        | 3 +--
 buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli b/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
index 72ffac972..aecb62d08 100755
--- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
@@ -6,7 +6,6 @@ CONFIG_FILE=/mnt/data/hassos.json
 CLI="$(jq --raw-output '.cli' ${CONFIG_FILE})"
 DOCKER_ARGS="$(jq --raw-output '.cli_args // empty' ${CONFIG_FILE})"
 APPARMOR="$(jq --raw-output '.cli_apparmor // "docker-default"' ${CONFIG_FILE})"
-MACHINE_ID="$(cat /etc/machine-id)"
 
 CLI_DATA=/mnt/data/cli
 mkdir -p ${CLI_DATA}
@@ -16,7 +15,7 @@ docker run \
     --rm -ti --init \
     --security-opt apparmor="${APPARMOR}" \
     -v ${CLI_DATA}:/data \
-    -e MACHINE_ID=${MACHINE_ID} \
+    -v /etc/machine-id:/etc/machine-id:ro \
     $DOCKER_ARGS \
     ${CLI}
 
diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
index 04f830e7c..e614a1454 100755
--- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
@@ -7,7 +7,6 @@ CONFIG_FILE=/mnt/data/hassos.json
 SUPERVISOR="$(jq --raw-output '.supervisor' ${CONFIG_FILE})"
 DOCKER_ARGS="$(jq --raw-output '.supervisor_args // empty' ${CONFIG_FILE})"
 APPARMOR="$(jq --raw-output '.supervisor_apparmor // "docker-default"' ${CONFIG_FILE})"
-MACHINE_ID="$(cat /etc/machine-id)"
 
 # Init supervisor
 HASSOS_DATA=/mnt/data/supervisor
@@ -25,10 +24,10 @@ runSupervisor() {
         --security-opt apparmor="${APPARMOR}" \
         -v /var/run/docker.sock:/var/run/docker.sock \
         -v /var/run/dbus:/var/run/dbus \
+        -v /etc/machine-id:/etc/machine-id:ro \
         -v ${HASSOS_DATA}:/data \
         -e SUPERVISOR_SHARE=${HASSOS_DATA} \
         -e SUPERVISOR_NAME=hassos_supervisor \
-        -e MACHINE_ID=${MACHINE_ID} \
         $DOCKER_ARGS \
         ${SUPERVISOR}
 }