Rename OS (#16)

Rename OS
This commit is contained in:
Pascal Vizeli
2018-05-14 22:37:39 +02:00
committed by GitHub
parent 4577d01a46
commit 3a5d2de705
82 changed files with 216 additions and 215 deletions

View File

@@ -2,7 +2,7 @@
set -e
# Load configs
CONFIG_FILE=/mnt/data/hassio.json
CONFIG_FILE=/mnt/data/hassos.json
# Read configs
PROFILES_DIR="$(jq --raw-output '.apparmor // empty' ${CONFIG_FILE})"

View File

@@ -1,7 +1,7 @@
#!/bin/sh
# Load configs
CONFIG_FILE=/mnt/data/hassio.json
CONFIG_FILE=/mnt/data/hassos.json
CLI="$(jq --raw-output '.cli' ${CONFIG_FILE})"
DOCKER_ARGS="$(jq --raw-output '.cli_args // empty' ${CONFIG_FILE})"

View File

@@ -1,14 +1,14 @@
#!/bin/sh
set -e
# Check if hassio-config is present
if ! findfs LABEL="hassio-config" > /dev/null; then
echo "[Warning] No hassio-config partition found!"
# Check if hassos-config is present
if ! findfs LABEL="hassos-config" > /dev/null; then
echo "[Warning] No hassos-config partition found!"
exit 0
fi
# Mount config partition
mount -o ro LABEL="hassio-config" /mnt/config
mount -o ro LABEL="hassos-config" /mnt/config
##
# NetworkManager

View File

@@ -1,7 +1,7 @@
#!/bin/sh
set -e
DEVICE_CHILD=$(findfs LABEL="hassio-data")
DEVICE_CHILD=$(findfs LABEL="hassos-data")
DEVICE_ROOT="/dev/$(lsblk -no pkname ${DEVICE_CHILD})"
# Need resize
@@ -11,14 +11,14 @@ if [ $(sgdisk -E ${DEVICE_ROOT}) -le 2048 ]; then
fi
# Resize & Reload partition
echo "[INFO] Update hassio-data partition"
sgdisk -d 6 -n 6:0:0 -c 6:"hassio-data" -t 6:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" ${DEVICE_ROOT}
echo "[INFO] Update hassos-data partition"
sgdisk -d 6 -n 6:0:0 -c 6:"hassos-data" -t 6:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 6:"a52a4597-fa3a-4851-aefd-2fbe9f849079" ${DEVICE_ROOT}
sgdisk -v ${DEVICE_ROOT}
partx -u ${DEVICE_ROOT}
# Resize filesystem
echo "[INFO] Resize hassio-data filesystem"
echo "[INFO] Resize hassos-data filesystem"
e2fsck -y ${DEVICE_CHILD}
resize2fs -f ${DEVICE_CHILD}
echo "[INFO] Finish hassio-data resizing"
echo "[INFO] Finish hassos-data resizing"

View File

@@ -2,16 +2,16 @@
set -e
# Load configs
CONFIG_FILE=/mnt/data/hassio.json
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})"
# Init supervisor
HASSIO_DATA=/mnt/data/supervisor
HASSIO_IMAGE_ID=$(docker inspect --format='{{.Id}}' ${SUPERVISOR})
HASSIO_CONTAINER_ID=$(docker inspect --format='{{.Image}}' hassio_supervisor || echo "")
HASSOS_DATA=/mnt/data/supervisor
HASSOS_IMAGE_ID=$(docker inspect --format='{{.Id}}' ${SUPERVISOR})
HASSOS_CONTAINER_ID=$(docker inspect --format='{{.Image}}' hassos_supervisor || echo "")
# Fix wrong AppArmor profiles
if ! grep ${APPARMOR} /sys/kernel/security/apparmor/profiles > /dev/null; then
@@ -19,18 +19,18 @@ if ! grep ${APPARMOR} /sys/kernel/security/apparmor/profiles > /dev/null; then
fi
runSupervisor() {
docker rm --force hassio_supervisor || true
docker run --name hassio_supervisor \
docker rm --force hassos_supervisor || true
docker run --name hassos_supervisor \
--security-opt apparmor="${APPARMOR}" \
-v /var/run/docker.sock:/var/run/docker.sock \
-v /var/run/dbus:/var/run/dbus \
-v ${HASSIO_DATA}:/data \
-e SUPERVISOR_SHARE=${HASSIO_DATA} \
-e SUPERVISOR_NAME=hassio_supervisor \
-v ${HASSOS_DATA}:/data \
-e SUPERVISOR_SHARE=${HASSOS_DATA} \
-e SUPERVISOR_NAME=hassos_supervisor \
$DOCKER_ARGS \
${SUPERVISOR}
}
# Run supervisor
mkdir -p ${HASSIO_DATA}
([ "${HASSIO_IMAGE_ID}" = "${HASSIO_CONTAINER_ID}" ] && docker start --attach hassio_supervisor) || runSupervisor
mkdir -p ${HASSOS_DATA}
([ "${HASSOS_IMAGE_ID}" = "${HASSOS_CONTAINER_ID}" ] && docker start --attach hassos_supervisor) || runSupervisor

View File

@@ -61,10 +61,10 @@ zramctl "$DEVICE" -s "$SIZE" -a lz4
# Swap
if [ "$TYPE" = "swap" ]; then
mkswap -L "hassio-zramswap" "$DEVICE"
mkswap -L "hassos-zramswap" "$DEVICE"
fi
# FileSystem
if [ "$TYPE" = "fs" ]; then
mkfs.ext4 -L "hassio-$MOUNT" -O ^has_journal "$DEVICE"
mkfs.ext4 -L "hassos-$MOUNT" -O ^has_journal "$DEVICE"
fi