Fabio/hassio-supervised-installer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use new machine flag (#102)

Browse source
This commit is contained in:
Pascal Vizeli 2020-08-13 11:25:20 +02:00 committed by GitHub
parent 632918f508
commit 4a5692cbb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
files/hassio-supervisor
View file

@ -5,7 +5,7 @@ set -e
CONFIG_FILE=%%HASSIO_CONFIG%% CONFIG_FILE=%%HASSIO_CONFIG%%
SUPERVISOR="$(jq --raw-output '.supervisor' ${CONFIG_FILE})" 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})" DATA="$(jq --raw-output '.data // "/usr/share/hassio"' ${CONFIG_FILE})"
# AppArmor Support # AppArmor Support
@ -30,10 +30,11 @@ runSupervisor() {
--security-opt seccomp=unconfined \ --security-opt seccomp=unconfined \
-v /run/docker.sock:/run/docker.sock \ -v /run/docker.sock:/run/docker.sock \
-v /run/dbus:/run/dbus \ -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_SHARE="${HASSIO_DATA}" \
-e SUPERVISOR_NAME=hassio_supervisor \ -e SUPERVISOR_NAME=hassio_supervisor \
-e HOMEASSISTANT_REPOSITORY="${HOMEASSISTANT}" \ -e SUPERVISOR_MACHINE="${MACHINE}" \
"${SUPERVISOR}" "${SUPERVISOR}"
} }

9
installer.sh
View file

@ -83,33 +83,28 @@ CONFIG=$SYSCONFDIR/hassio.json
case $ARCH in case $ARCH in
"i386" | "i686") "i386" | "i686")
MACHINE=${MACHINE:=qemux86} MACHINE=${MACHINE:=qemux86}
HOMEASSISTANT_DOCKER="$DOCKER_REPO/$MACHINE-homeassistant"
HASSIO_DOCKER="$DOCKER_REPO/i386-hassio-supervisor" HASSIO_DOCKER="$DOCKER_REPO/i386-hassio-supervisor"
;; ;;
"x86_64") "x86_64")
MACHINE=${MACHINE:=qemux86-64} MACHINE=${MACHINE:=qemux86-64}
HOMEASSISTANT_DOCKER="$DOCKER_REPO/$MACHINE-homeassistant"
HASSIO_DOCKER="$DOCKER_REPO/amd64-hassio-supervisor" HASSIO_DOCKER="$DOCKER_REPO/amd64-hassio-supervisor"
;; ;;
"arm" |"armv6l") "arm" |"armv6l")
if [ -z $MACHINE ]; then if [ -z $MACHINE ]; then
error "Please set machine for $ARCH" error "Please set machine for $ARCH"
fi fi
HOMEASSISTANT_DOCKER="$DOCKER_REPO/$MACHINE-homeassistant"
HASSIO_DOCKER="$DOCKER_REPO/armhf-hassio-supervisor" HASSIO_DOCKER="$DOCKER_REPO/armhf-hassio-supervisor"
;; ;;
"armv7l") "armv7l")
if [ -z $MACHINE ]; then if [ -z $MACHINE ]; then
error "Please set machine for $ARCH" error "Please set machine for $ARCH"
fi fi
HOMEASSISTANT_DOCKER="$DOCKER_REPO/$MACHINE-homeassistant"
HASSIO_DOCKER="$DOCKER_REPO/armv7-hassio-supervisor" HASSIO_DOCKER="$DOCKER_REPO/armv7-hassio-supervisor"
;; ;;
"aarch64") "aarch64")
if [ -z $MACHINE ]; then if [ -z $MACHINE ]; then
error "Please set machine for $ARCH" error "Please set machine for $ARCH"
fi fi
HOMEASSISTANT_DOCKER="$DOCKER_REPO/$MACHINE-homeassistant"
HASSIO_DOCKER="$DOCKER_REPO/aarch64-hassio-supervisor" HASSIO_DOCKER="$DOCKER_REPO/aarch64-hassio-supervisor"
;; ;;
*) *)
@ -140,7 +135,7 @@ HASSIO_VERSION=$(curl -s $URL_VERSION | jq -e -r '.supervisor')
cat > "$CONFIG" <<- EOF cat > "$CONFIG" <<- EOF
{ {
"supervisor": "${HASSIO_DOCKER}", "supervisor": "${HASSIO_DOCKER}",
"homeassistant": "${HOMEASSISTANT_DOCKER}", "machine": "${MACHINE}",
"data": "${DATA_SHARE}" "data": "${DATA_SHARE}"
} }
EOF EOF
@ -187,7 +182,7 @@ fi
## ##
# Init system # Init system
echo "[Info] Run Hass.io" echo "[Info] Run Home Assistant Supervised"
systemctl start hassio-supervisor.service systemctl start hassio-supervisor.service
## ##