diff --git a/README.md b/README.md index a47de1802..eb703c870 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -# WORK IN PROGRESS! - -# Hass.io OS +# HassOS Hass.io OS based on [buildroot](https://buildroot.org/). It's a hypervisor for Docker and supports various kind of IoT hardware. It is also available as virtual appliance. The whole system is optimized for embedded system and security. You can update the system simple with OTA updates or offline updates. ## Focus @@ -29,14 +27,15 @@ Create a USB stick with a partition named "hassio-config". This partition can in ## Supervisor/Cli -Provide a file with the name `hassio.json` in your data partition and the following structure: +Provide a file with the name `hassos.json` in your data partition and the following structure: ```json { "supervisor": "repo/image", "supervisor_args": "optional / custom docker arguments", "cli": "repo/image", - "cli_args": "optional / custom docker arguments" + "cli_args": "optional / custom docker arguments", + "hostname": "default hostname" } ``` @@ -44,8 +43,6 @@ Provide a file with the name `hassio.json` in your data partition and the follow Running `sudo ./enter.sh` will get you into the build Docker container. `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external xy_defconfig` -From outside the Docker container, while it is still running you can use `./getimage.sh` to get the output image. - ## Helpers - `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external defconfig BR2_DEFCONFIG=/build/buildroot-external/configs/xy_defconfig` diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 2df71695d..9c304a6ee 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -1,4 +1,4 @@ -source "$BR2_EXTERNAL_HASSIO_PATH/package/mingetty/Config.in" -source "$BR2_EXTERNAL_HASSIO_PATH/package/hassio/Config.in" -source "$BR2_EXTERNAL_HASSIO_PATH/package/libapparmor/Config.in" -source "$BR2_EXTERNAL_HASSIO_PATH/package/apparmor/Config.in" +source "$BR2_EXTERNAL_HASSOS_PATH/package/mingetty/Config.in" +source "$BR2_EXTERNAL_HASSOS_PATH/package/hassos/Config.in" +source "$BR2_EXTERNAL_HASSOS_PATH/package/libapparmor/Config.in" +source "$BR2_EXTERNAL_HASSOS_PATH/package/apparmor/Config.in" diff --git a/buildroot-external/barebox-env/menu/title b/buildroot-external/barebox-env/menu/title index c1f4371f8..100a25297 100644 --- a/buildroot-external/barebox-env/menu/title +++ b/buildroot-external/barebox-env/menu/title @@ -1 +1 @@ -Hass.io OS boot Menu: +HassOS boot Menu: diff --git a/buildroot-external/board/ova/barebox.config b/buildroot-external/board/ova/barebox.config index e21b5997f..24a3e34fb 100644 --- a/buildroot-external/board/ova/barebox.config +++ b/buildroot-external/board/ova/barebox.config @@ -2,7 +2,7 @@ CONFIG_MMU=y CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y -CONFIG_PROMPT="hassio-os:" +CONFIG_PROMPT="HassOS-boot:" CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y diff --git a/buildroot-external/board/ova/post-image.sh b/buildroot-external/board/ova/post-image.sh index cdd85e96b..36aee53a8 100755 --- a/buildroot-external/board/ova/post-image.sh +++ b/buildroot-external/board/ova/post-image.sh @@ -1,16 +1,16 @@ #!/bin/bash set -e -SCRIPT_DIR=${BR2_EXTERNAL_HASSIO_PATH}/scripts +SCRIPT_DIR=${BR2_EXTERNAL_HASSOS_PATH}/scripts BOARD_DIR=${2} BOOT_DATA=${BINARIES_DIR}/boot -. ${SCRIPT_DIR}/hdd_image.sh -. ${BR2_EXTERNAL_HASSIO_PATH}/info +. ${SCRIPT_DIR}/hdd-image.sh +. ${BR2_EXTERNAL_HASSOS_PATH}/info . ${BOARD_DIR}/info # Filename -IMAGE_FILE=hassio-os_${BOARD_ID}-${VERSION_MAJOR}.${VERSION_BUILD}.vmdk +IMAGE_FILE=${HASSOS_ID}_${BOARD_ID}-${VERSION_MAJOR}.${VERSION_BUILD}.vmdk # Init boot data rm -rf ${BOOT_DATA} @@ -21,9 +21,9 @@ cp ${BINARIES_DIR}/barebox.bin ${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI cp ${BOARD_DIR}/barebox-state.dtb ${BOOT_DATA}/EFI/barebox/state.dtb # Create other layers -hassio_boot_image ${BINARIES_DIR} -hassio_overlay_image ${BINARIES_DIR} +create_boot_image ${BINARIES_DIR} +create_overlay_image ${BINARIES_DIR} -hassio_hdd_image ${BINARIES_DIR} ${BINARIES_DIR}/harddisk.img 6 +create_hdd_image ${BINARIES_DIR} ${BINARIES_DIR}/harddisk.img 6 qemu-img convert -O vmdk ${BINARIES_DIR}/harddisk.img ${BINARIES_DIR}/${IMAGE_FILE} diff --git a/buildroot-external/board/ova/rootfs-overlay/etc/rauc.conf b/buildroot-external/board/ova/rootfs-overlay/etc/rauc.conf index 149ccd835..6f026ab15 100644 --- a/buildroot-external/board/ova/rootfs-overlay/etc/rauc.conf +++ b/buildroot-external/board/ova/rootfs-overlay/etc/rauc.conf @@ -1,21 +1,21 @@ [system] -compatible=Hass.io-OS ova +compatible=HassOS ova bootloader=barebox [keyring] path=/etc/rauc/keyring.pem [slot.boot.0] -device=/dev/sda0 +device=/dev/disk/by-partuuid/b3dd0952-733c-4c88-8cba-cab9b8b4377f type=vfs bootname=boot [slot.rootfs.0] -device=/dev/sda2 +device=/dev/disk/by-partuuid/8d3d53e3-6d49-4c38-8349-aff6859e82fd type=raw bootname=system0 [slot.rootfs.1] -device=/dev/sda3 +device=/dev/disk/by-partuuid/a3ec664e-32ce-4665-95ea-7ae90ce9aa20 type=raw bootname=system1 diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index d1f0d4107..0d0dbcecb 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -1,27 +1,27 @@ BR2_x86_64=y BR2_CCACHE=y BR2_CCACHE_DIR="$(TOPDIR)/ccache" -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSIO_PATH)/patches $(BR2_EXTERNAL_HASSIO_PATH)/board/ova/patches" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/ova/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to Hass.io" +BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSIO_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSIO_PATH)/board/ova/rootfs-overlay" -BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSIO_PATH)/scripts/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSIO_PATH)/board/ova/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSIO_PATH)/board/ova" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/ova/rootfs-overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSIO_PATH)/board/ova/kernel.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSIO_PATH)/busybox.config" +BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y BR2_PACKAGE_JQ=y BR2_PACKAGE_DOSFSTOOLS=y @@ -56,21 +56,21 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BAREBOX=y BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y -BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSIO_PATH)/board/ova/barebox.config" -BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_HASSIO_PATH)/board/ova/barebox-env $(BR2_EXTERNAL_HASSIO_PATH)/barebox-env" +BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova/barebox.config" +BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova/barebox-env $(BR2_EXTERNAL_HASSOS_PATH)/barebox-env" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_MINGETTY=y -BR2_PACKAGE_HASSIO=y -BR2_PACKAGE_HASSIO_SUPERVISOR="homeassistant/amd64-hassio-supervisor" -BR2_PACKAGE_HASSIO_SUPERVISOR_VERSION="103.3" -BR2_PACKAGE_HASSIO_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/qemux86-64-homeassistant" -BR2_PACKAGE_HASSIO_SUPERVISOR_PROFILE="hassio-supervisor" -BR2_PACKAGE_HASSIO_CLI="homeassistant/amd64-hassio-cli" -BR2_PACKAGE_HASSIO_CLI_VERSION="3" -BR2_PACKAGE_HASSIO_CLI_PROFILE="docker-default" -BR2_PACKAGE_HASSIO_APPARMOR_DIR="supervisor/apparmor" +BR2_PACKAGE_HASSOS=y +BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="103.3" +BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/qemux86-64-homeassistant" +BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" +BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli" +BR2_PACKAGE_HASSOS_CLI_VERSION="3" +BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" +BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" BR2_PACKAGE_APPARMOR=y diff --git a/buildroot-external/external.desc b/buildroot-external/external.desc index 06b7c2d37..c366838dc 100644 --- a/buildroot-external/external.desc +++ b/buildroot-external/external.desc @@ -1,2 +1,2 @@ -name: HASSIO -desc: HassIO Buildroot tree +name: HASSOS +desc: HassOS Buildroot tree diff --git a/buildroot-external/external.mk b/buildroot-external/external.mk index 8436bd60f..a8e7d1783 100644 --- a/buildroot-external/external.mk +++ b/buildroot-external/external.mk @@ -1 +1 @@ -include $(sort $(wildcard $(BR2_EXTERNAL_HASSIO_PATH)/package/*/*.mk)) +include $(sort $(wildcard $(BR2_EXTERNAL_HASSOS_PATH)/package/*/*.mk)) diff --git a/buildroot-external/info b/buildroot-external/info index 8ef60ff5b..8032ca233 100644 --- a/buildroot-external/info +++ b/buildroot-external/info @@ -2,5 +2,6 @@ VERSION_MAJOR=0 VERSION_BUILD=3 HASSOS_NAME="HassOS" +HASSOS_ID="hassos" DEPLOYMENT=development diff --git a/buildroot-external/package/hassio/hassio.mk b/buildroot-external/package/hassio/hassio.mk deleted file mode 100644 index 1d89ab7f8..000000000 --- a/buildroot-external/package/hassio/hassio.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# hassio -# -################################################################################ - -HASSIO_VERSION = 1.0.0 -HASSIO_LICENSE = Apache License 2.0 -HASSIO_LICENSE_FILES = $(BR2_EXTERNAL_HASSIO_PATH)/../LICENSE -HASSIO_SITE = $(BR2_EXTERNAL_HASSIO_PATH)/package/hassio -HASSIO_SITE_METHOD = local - -define HASSIO_BUILD_CMDS - docker build --tag hassio-hostapps $(@D)/builder -endef - -define HASSIO_INSTALL_TARGET_CMDS - docker run --rm --privileged \ - -v $(BINARIES_DIR):/export \ - -v $(BR2_EXTERNAL_HASSIO_PATH)/apparmor:/apparmor \ - hassio-hostapps \ - --supervisor $(BR2_PACKAGE_HASSIO_SUPERVISOR) \ - --supervisor-version $(BR2_PACKAGE_HASSIO_SUPERVISOR_VERSION) \ - --supervisor-args $(BR2_PACKAGE_HASSIO_SUPERVISOR_ARGS) \ - --supervisor-profile $(BR2_PACKAGE_HASSIO_SUPERVISOR_PROFILE) \ - --cli $(BR2_PACKAGE_HASSIO_CLI) \ - --cli-version $(BR2_PACKAGE_HASSIO_CLI_VERSION) \ - --cli-args $(BR2_PACKAGE_HASSIO_CLI_ARGS) \ - --cli-profile $(BR2_PACKAGE_HASSIO_CLI_PROFILE) \ - --apparmor $(BR2_PACKAGE_HASSIO_APPARMOR_DIR) -endef - -$(eval $(generic-package)) diff --git a/buildroot-external/package/hassio/Config.in b/buildroot-external/package/hassos/Config.in similarity index 65% rename from buildroot-external/package/hassio/Config.in rename to buildroot-external/package/hassos/Config.in index b659ce4c4..6d5c8298d 100644 --- a/buildroot-external/package/hassio/Config.in +++ b/buildroot-external/package/hassos/Config.in @@ -1,54 +1,54 @@ -menuconfig BR2_PACKAGE_HASSIO - bool "hassio-app" +menuconfig BR2_PACKAGE_HASSOS + bool "hassos-app" help This is the Application layer they build the data partition with configurations. - https://github.com/home-assistant/hassio-os + https://github.com/home-assistant/hassos -if BR2_PACKAGE_HASSIO +if BR2_PACKAGE_HASSOS -config BR2_PACKAGE_HASSIO_SUPERVISOR +config BR2_PACKAGE_HASSOS_SUPERVISOR string "supervisor docker image" help Name of supervisor docker image they will be build in. -config BR2_PACKAGE_HASSIO_SUPERVISOR_VERSION +config BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION string "supervisor docker image version" help Version of supervisor docker image they will be build in. -config BR2_PACKAGE_HASSIO_SUPERVISOR_ARGS +config BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS string "supervisor docker arguments" help Extended docker arguments to run the supervisor. -config BR2_PACKAGE_HASSIO_SUPERVISOR_PROFILE +config BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE string "AppArmor supervisor profile" help AppArmor profile for supervisor. -config BR2_PACKAGE_HASSIO_CLI +config BR2_PACKAGE_HASSOS_CLI string "cli docker image" help Name of cli docker image they will be build in. -config BR2_PACKAGE_HASSIO_CLI_VERSION +config BR2_PACKAGE_HASSOS_CLI_VERSION string "cli docker image version" help Version of cli docker image they will be build in. -config BR2_PACKAGE_HASSIO_CLI_ARGS +config BR2_PACKAGE_HASSOS_CLI_ARGS string "cli docker arguments" help Extended docker arguments to run the cli. -config BR2_PACKAGE_HASSIO_CLI_PROFILE +config BR2_PACKAGE_HASSOS_CLI_PROFILE string "AppArmor cli profile" help AppArmor profile for cli. -config BR2_PACKAGE_HASSIO_APPARMOR_DIR +config BR2_PACKAGE_HASSOS_APPARMOR_DIR string "AppArmor profiles folder" help AppArmor profiles folder for supervisor. diff --git a/buildroot-external/package/hassio/builder/Dockerfile b/buildroot-external/package/hassos/builder/Dockerfile similarity index 100% rename from buildroot-external/package/hassio/builder/Dockerfile rename to buildroot-external/package/hassos/builder/Dockerfile diff --git a/buildroot-external/package/hassio/builder/hostapp.sh b/buildroot-external/package/hassos/builder/hostapp.sh similarity index 95% rename from buildroot-external/package/hassio/builder/hostapp.sh rename to buildroot-external/package/hassos/builder/hostapp.sh index c226ba394..f140bc989 100755 --- a/buildroot-external/package/hassio/builder/hostapp.sh +++ b/buildroot-external/package/hassos/builder/hostapp.sh @@ -61,7 +61,7 @@ done # Make image dd if=/dev/zero of=${DATA_IMG} bs=1G count=1 -mkfs.ext4 -L "hassio-data" -E lazy_itable_init=0,lazy_journal_init=0 ${DATA_IMG} +mkfs.ext4 -L "hassos-data" -E lazy_itable_init=0,lazy_journal_init=0 ${DATA_IMG} # Mount / init file structs mkdir -p /mnt/data/ @@ -91,7 +91,7 @@ docker pull "${CLI}:${CLI_VERSION}" docker tag "${CLI}:${CLI_VERSION}" "${CLI}:latest" # Write config -cat > /mnt/data/hassio.json <<- EOF +cat > /mnt/data/hassos.json <<- EOF { "supervisor": "${SUPERVISOR}", "supervisor_args": "${SUPERVISOR_ARGS}", diff --git a/buildroot-external/package/hassos/hassos.mk b/buildroot-external/package/hassos/hassos.mk new file mode 100644 index 000000000..dc32946a9 --- /dev/null +++ b/buildroot-external/package/hassos/hassos.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# HassOS +# +################################################################################ + +HASSOS_VERSION = 1.0.0 +HASSOS_LICENSE = Apache License 2.0 +HASSOS_LICENSE_FILES = $(BR2_EXTERNAL_HASSOS_PATH)/../LICENSE +HASSOS_SITE = $(BR2_EXTERNAL_HASSOS_PATH)/package/hassos +HASSOS_SITE_METHOD = local + +define HASSOS_BUILD_CMDS + docker build --tag hassos-hostapps $(@D)/builder +endef + +define HASSOS_INSTALL_TARGET_CMDS + docker run --rm --privileged \ + -v $(BINARIES_DIR):/export \ + -v $(BR2_EXTERNAL_HASSOS_PATH)/apparmor:/apparmor \ + hassos-hostapps \ + --supervisor $(BR2_PACKAGE_HASSOS_SUPERVISOR) \ + --supervisor-version $(BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION) \ + --supervisor-args $(BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS) \ + --supervisor-profile $(BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE) \ + --cli $(BR2_PACKAGE_HASSOS_CLI) \ + --cli-version $(BR2_PACKAGE_HASSOS_CLI_VERSION) \ + --cli-args $(BR2_PACKAGE_HASSOS_CLI_ARGS) \ + --cli-profile $(BR2_PACKAGE_HASSOS_CLI_PROFILE) \ + --apparmor $(BR2_PACKAGE_HASSOS_APPARMOR_DIR) +endef + +$(eval $(generic-package)) diff --git a/buildroot-external/rootfs-overlay/etc/apparmor.d/containers/.empty b/buildroot-external/rootfs-overlay/etc/apparmor.d/containers/.empty deleted file mode 100644 index 8b1378917..000000000 --- a/buildroot-external/rootfs-overlay/etc/apparmor.d/containers/.empty +++ /dev/null @@ -1 +0,0 @@ - diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassio.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassio.conf rename to buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassio.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassos.conf similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassio.conf rename to buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassos.conf diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/hassio.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/hassos.conf similarity index 53% rename from buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/hassio.conf rename to buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/hassos.conf index fa1221712..53a8d88b0 100644 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/hassio.conf +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/hassos.conf @@ -1,2 +1,3 @@ [Unit] +Requires=docker.service After=docker.service diff --git "a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" "b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" similarity index 100% rename from "buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" rename to "buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-docker.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-docker.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-docker.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-docker.mount diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-dropbear.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-dropbear.mount diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-hostname.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-hostname.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-hostname.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-hostname.mount diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-hosts.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-hosts.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-hosts.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-hosts.mount diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/root-.docker.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/root-.docker.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/root-.docker.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/root-.docker.mount diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-docker.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-docker.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-docker.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-docker.mount diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-systemd.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-systemd.mount diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-log-journal.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-log-journal.mount diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-supervisor.service.d/rauc.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-supervisor.service.d/rauc.conf similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-supervisor.service.d/rauc.conf rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassos-supervisor.service.d/rauc.conf diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-zram.target.wants/zram-swap.service b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-zram.target.wants/zram-swap.service similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-zram.target.wants/zram-swap.service rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassos-zram.target.wants/zram-swap.service diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-zram.target.wants/zram-tmp.service b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-zram.target.wants/zram-tmp.service similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-zram.target.wants/zram-tmp.service rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassos-zram.target.wants/zram-tmp.service diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-zram.target.wants/zram-var.service b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-zram.target.wants/zram-var.service similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-zram.target.wants/zram-var.service rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassos-zram.target.wants/zram-var.service diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassio-expand.service b/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassio-expand.service deleted file mode 120000 index 0d497084a..000000000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassio-expand.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/hassio-expand.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassos-expand.service b/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassos-expand.service new file mode 120000 index 000000000..fe1d13e6d --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassos-expand.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/hassos-expand.service diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-apparmor.service b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-apparmor.service deleted file mode 120000 index 625edb930..000000000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-apparmor.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/hassio-apparmor.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-bind.target b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-bind.target deleted file mode 120000 index b1966adb3..000000000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-bind.target +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/hassio-bind.target \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-config.service b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-config.service deleted file mode 120000 index 61c279a59..000000000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-config.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/hassio-config.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-supervisor.service b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-supervisor.service deleted file mode 120000 index 855f70d36..000000000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-supervisor.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/hassio-supervisor.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-zram.target b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-zram.target deleted file mode 120000 index 260a4c351..000000000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassio-zram.target +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/hassio-zram.target \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-apparmor.service b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-apparmor.service new file mode 120000 index 000000000..5c3399155 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-apparmor.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/hassos-apparmor.service diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-bind.target b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-bind.target new file mode 120000 index 000000000..60e9c455b --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-bind.target @@ -0,0 +1 @@ +/usr/lib/systemd/system/hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-config.service b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-config.service new file mode 120000 index 000000000..bbd767dd6 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-config.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/hassos-config.service diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-supervisor.service b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-supervisor.service new file mode 120000 index 000000000..b8b6bdf79 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-supervisor.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/hassos-supervisor.service diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-zram.target b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-zram.target new file mode 120000 index 000000000..d554b3c69 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-zram.target @@ -0,0 +1 @@ +/usr/lib/systemd/system/hassos-zram.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/dev-zram0.swap b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/dev-zram0.swap index 402c25505..8b12ac06d 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/dev-zram0.swap +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/dev-zram0.swap @@ -1,5 +1,5 @@ [Unit] -Description=Hassio ZRAM swap +Description=HassOS ZRAM swap Requires=zram-swap.service After=zram-swap.service diff --git "a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" "b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" index dad2df8f4..a84d927da 100644 --- "a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" +++ "b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" @@ -2,7 +2,7 @@ Description=NetworkManager system connections Requires=mnt-overlay.mount After=mnt-overlay.mount -Before=NetworkManager.service hassio-config.service +Before=NetworkManager.service hassos-config.service [Mount] What=/mnt/overlay/etc/NetworkManager/system-connections @@ -11,4 +11,4 @@ Type=None Options=bind [Install] -WantedBy=hassio-bind.target +WantedBy=hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount index 7928c4b38..bb7a80cbb 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount @@ -11,4 +11,4 @@ Type=none Options=bind [Install] -WantedBy=hassio-bind.target +WantedBy=hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount index 167a07850..067893130 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount @@ -11,4 +11,4 @@ Type=none Options=bind [Install] -WantedBy=hassio-bind.target +WantedBy=hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hostname.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hostname.mount index be4a26bea..d00309e4f 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hostname.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hostname.mount @@ -11,4 +11,4 @@ Type=none Options=bind [Install] -WantedBy=hassio-bind.target +WantedBy=hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hosts.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hosts.mount index 366be9906..68c33e457 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hosts.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hosts.mount @@ -11,4 +11,4 @@ Type=none Options=bind [Install] -WantedBy=hassio-bind.target +WantedBy=hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-apparmor.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-apparmor.service deleted file mode 100644 index db8bf42a4..000000000 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-apparmor.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Hass.io AppArmor -Wants=hassio-supervisor.service -Before=docker.service hassio-supervisor.service -RequiresMountsFor=/mnt/data - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/sbin/hassio-apparmor - -[Install] -WantedBy=multi-user.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-config.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-config.service deleted file mode 100644 index 86873abd4..000000000 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-config.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Hassio Configuration Manager -After=hassio-bind.target network.target - -[Service] -Type=oneshot -ExecStart=/sbin/hassio-config - -[Install] -WantedBy=multi-user.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service new file mode 100644 index 000000000..82934470a --- /dev/null +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service @@ -0,0 +1,13 @@ +[Unit] +Description=HassOS AppArmor +Wants=hassos-supervisor.service +Before=docker.service hassos-supervisor.service +RequiresMountsFor=/mnt/data + +[Service] +Type=oneshot +RemainAfterExit=true +ExecStart=/usr/sbin/hassos-apparmor + +[Install] +WantedBy=multi-user.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-bind.target b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-bind.target similarity index 71% rename from buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-bind.target rename to buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-bind.target index 89f74b94d..2aa73f380 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-bind.target +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-bind.target @@ -1,5 +1,5 @@ [Unit] -Description=Hassio overlay targets +Description=HassOS overlay targets Documentation=man:systemd.target(5) After=local-fs.target Before=sysinit.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-config.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-config.service new file mode 100644 index 000000000..22d6e811a --- /dev/null +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-config.service @@ -0,0 +1,10 @@ +[Unit] +Description=HassOS Configuration Manager +After=hassos-bind.target network.target + +[Service] +Type=oneshot +ExecStart=/usr/sbin/hassos-config + +[Install] +WantedBy=multi-user.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-expand.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service similarity index 66% rename from buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-expand.service rename to buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service index f8b9ea15a..b916789bf 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-expand.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service @@ -1,11 +1,11 @@ [Unit] -Description=Hassio data resizing +Description=HassOS data resizing DefaultDependencies=no Before=mnt-data.mount [Service] Type=oneshot -ExecStart=/sbin/hassio-expand +ExecStart=/usr/sbin/hassos-expand RemainAfterExit=true [Install] diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-supervisor.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service similarity index 56% rename from buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-supervisor.service rename to buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service index 03b3dd108..66bde2b66 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-supervisor.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service @@ -1,5 +1,5 @@ [Unit] -Description=Hass.io supervisor +Description=HassOS supervisor Requires=docker.service After=docker.service dbus.socket RequiresMountsFor=/mnt/data @@ -10,9 +10,9 @@ StartLimitBurst=5 Type=simple Restart=always RestartSec=5s -ExecStartPre=-/usr/bin/docker stop hassio_supervisor -ExecStart=/usr/sbin/hassio-supervisor -ExecStop=-/usr/bin/docker stop hassio_supervisor +ExecStartPre=-/usr/bin/docker stop hassos_supervisor +ExecStart=/usr/sbin/hassos-supervisor +ExecStop=-/usr/bin/docker stop hassos_supervisor [Install] WantedBy=multi-user.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-zram.target b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-zram.target similarity index 57% rename from buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-zram.target rename to buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-zram.target index 35fd5050c..f94232646 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-zram.target +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-zram.target @@ -1,3 +1,3 @@ [Unit] -Description=Hassio zram targets +Description=HassOS zram targets Documentation=man:systemd.target(5) diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount index 38c7f3b82..5658e82d4 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount @@ -1,12 +1,12 @@ [Unit] -Description=Hassio boot partition +Description=HassOS boot partition DefaultDependencies=no Before=umount.target After=local-fs.target Conflicts=umount.target [Mount] -What=LABEL=hassio-boot +What=LABEL=hassos-boot Where=/mnt/boot Type=auto diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount index c439aacf3..53cbd320d 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount @@ -1,13 +1,13 @@ [Unit] -Description=Hassio data partition -Wants=hassio-expand.service +Description=HassOS data partition +Wants=hassos-expand.service DefaultDependencies=no -After=hassio-expand.service +After=hassos-expand.service Before=umount.target systemd-tmpfiles-setup.service Conflicts=umount.target [Mount] -What=LABEL=hassio-data +What=LABEL=hassos-data Where=/mnt/data Type=ext4 diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount index 7af4b28a0..5fa9b62ec 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount @@ -1,11 +1,11 @@ [Unit] -Description=Hassio overlay partition +Description=HassOS overlay partition DefaultDependencies=no Before=umount.target systemd-tmpfiles-setup.service Conflicts=umount.target [Mount] -What=LABEL=hassio-overlay +What=LABEL=hassos-overlay Where=/mnt/overlay Type=ext4 diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-bad.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-bad.service index f93c5663a..baf737fe9 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-bad.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-bad.service @@ -1,5 +1,5 @@ [Unit] -Description=Rauc mark bad +Description=HassOS rauc bad Requires=rauc.service RefuseManualStart=true RefuseManualStop=true diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.service index 907ab3a26..f07f2fbb9 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.service @@ -1,6 +1,6 @@ [Unit] -Description=Hassio rauc good -Requires=hassio-supervisor.service rauc.service +Description=HassOS rauc good +Requires=hassos-supervisor.service rauc.service RefuseManualStart=true RefuseManualStop=true diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.timer b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.timer index 88671f8eb..fa79b78fd 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.timer +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.timer @@ -1,5 +1,5 @@ [Unit] -Description=Rauc mark boot partition as good +Description=HassOS mark boot partition as good [Timer] OnBootSec=1min diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/root-.docker.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/root-.docker.mount index 93e1c48b9..69a223ad6 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/root-.docker.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/root-.docker.mount @@ -11,4 +11,4 @@ Type=None Options=bind [Install] -WantedBy=hassio-bind.target +WantedBy=hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/root-.ssh.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/root-.ssh.mount index 6fbbaf3d9..d36284f65 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/root-.ssh.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/root-.ssh.mount @@ -2,7 +2,7 @@ Description=Dropbear persistent user Requires=mnt-overlay.mount After=mnt-overlay.mount -Before=dropbear.service hassio-config.service +Before=dropbear.service hassos-config.service [Mount] What=/mnt/overlay/root/.ssh @@ -11,4 +11,4 @@ Type=None Options=bind [Install] -WantedBy=hassio-bind.target +WantedBy=hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-docker.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-docker.mount index f602e8331..e2f76c401 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-docker.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-docker.mount @@ -11,4 +11,4 @@ Type=none Options=bind [Install] -WantedBy=hassio-bind.target +WantedBy=hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-systemd.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-systemd.mount index bc3119fdc..132b04c54 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-systemd.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-systemd.mount @@ -10,4 +10,4 @@ Type=None Options=bind [Install] -WantedBy=hassio-bind.target +WantedBy=hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-log-journal.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-log-journal.mount index 3323ab8f3..32391d920 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-log-journal.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-log-journal.mount @@ -11,4 +11,4 @@ Type=None Options=bind [Install] -WantedBy=hassio-bind.target +WantedBy=hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var.mount index fa327ae98..e572b8661 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var.mount @@ -1,5 +1,5 @@ [Unit] -Description=Hassio ZRAM var +Description=HassOS ZRAM var DefaultDependencies=no Requires=zram-var.service After=zram-var.service diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service index 0026d385f..2f340f0d6 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service @@ -1,13 +1,13 @@ [Unit] -Description=Hassio ZRAM +Description=HassOS ZRAM swap DefaultDependencies=no Before=dev-zram0.swap [Service] Type=oneshot -ExecStart=/sbin/hassio-zram -t swap +ExecStart=/usr/sbin/hassos-zram -t swap RemainAfterExit=true StandardOutput=null [Install] -WantedBy=hassio-zram.target +WantedBy=hassos-zram.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service index d1815a20e..a7a6a5edc 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service @@ -1,13 +1,13 @@ [Unit] -Description=Hassio ZRAM tmp +Description=HassOS ZRAM tmp DefaultDependencies=no Before=tmp.mount [Service] Type=oneshot -ExecStart=/sbin/hassio-zram -t fs -m tmp -s 16M +ExecStart=/usr/sbin/hassos-zram -t fs -m tmp -s 16M RemainAfterExit=true StandardOutput=null [Install] -WantedBy=hassio-zram.target +WantedBy=hassos-zram.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service index 26771d003..89640cd81 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service @@ -1,13 +1,13 @@ [Unit] -Description=Hassio ZRAM var +Description=HassOS ZRAM var DefaultDependencies=no Before=var.mount [Service] Type=oneshot -ExecStart=/sbin/hassio-zram -t fs -m var -s 32M +ExecStart=/usr/sbin/hassos-zram -t fs -m var -s 32M RemainAfterExit=true StandardOutput=null [Install] -WantedBy=hassio-zram.target +WantedBy=hassos-zram.target diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassio-apparmor b/buildroot-external/rootfs-overlay/usr/sbin/hassos-apparmor similarity index 96% rename from buildroot-external/rootfs-overlay/usr/sbin/hassio-apparmor rename to buildroot-external/rootfs-overlay/usr/sbin/hassos-apparmor index bba158658..f36cadb82 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassio-apparmor +++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-apparmor @@ -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})" diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassio-cli b/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli similarity index 93% rename from buildroot-external/rootfs-overlay/usr/sbin/hassio-cli rename to buildroot-external/rootfs-overlay/usr/sbin/hassos-cli index 02b682865..8f8804c99 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassio-cli +++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli @@ -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})" diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassio-config b/buildroot-external/rootfs-overlay/usr/sbin/hassos-config similarity index 76% rename from buildroot-external/rootfs-overlay/usr/sbin/hassio-config rename to buildroot-external/rootfs-overlay/usr/sbin/hassos-config index 6d5f67b71..b71964850 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassio-config +++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-config @@ -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 diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassio-expand b/buildroot-external/rootfs-overlay/usr/sbin/hassos-expand similarity index 53% rename from buildroot-external/rootfs-overlay/usr/sbin/hassio-expand rename to buildroot-external/rootfs-overlay/usr/sbin/hassos-expand index ce11d0ae2..eec4ebccf 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassio-expand +++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-expand @@ -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" diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassio-supervisor b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor similarity index 53% rename from buildroot-external/rootfs-overlay/usr/sbin/hassio-supervisor rename to buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor index 4b7bccdd3..3ec156468 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassio-supervisor +++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor @@ -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 diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassio-zram b/buildroot-external/rootfs-overlay/usr/sbin/hassos-zram similarity index 91% rename from buildroot-external/rootfs-overlay/usr/sbin/hassio-zram rename to buildroot-external/rootfs-overlay/usr/sbin/hassos-zram index 831b3229f..3012cba80 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassio-zram +++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-zram @@ -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 diff --git a/buildroot-external/scripts/hdd_image.sh b/buildroot-external/scripts/hdd-image.sh similarity index 78% rename from buildroot-external/scripts/hdd_image.sh rename to buildroot-external/scripts/hdd-image.sh index befdb00ea..c9b25a610 100755 --- a/buildroot-external/scripts/hdd_image.sh +++ b/buildroot-external/scripts/hdd-image.sh @@ -13,24 +13,24 @@ SYSTEM_SIZE=256M OVERLAY_SIZE=64M DATA_SIZE=1G -function hassio_boot_image() { +function create_boot_image() { local boot_data="${1}/boot" local boot_img="${1}/boot.vfat" echo "mtools_skip_check=1" > ~/.mtoolsrc dd if=/dev/zero of=${boot_img} bs=${BOOT_SIZE} count=1 - mkfs.vfat -n "hassio-boot" ${boot_img} + mkfs.vfat -n "hassos-boot" ${boot_img} mcopy -i ${boot_img} -sv ${boot_data}/* :: } -function hassio_overlay_image() { +function create_overlay_image() { local overlay_img="${1}/overlay.ext4" dd if=/dev/zero of=${overlay_img} bs=${OVERLAY_SIZE} count=1 - mkfs.ext4 -L "hassio-overlay" -E lazy_itable_init=0,lazy_journal_init=0 ${overlay_img} + mkfs.ext4 -L "hassos-overlay" -E lazy_itable_init=0,lazy_journal_init=0 ${overlay_img} } -function hassio_hdd_image() { +function create_hdd_image() { local boot_img="${1}/boot.vfat" local rootfs_img="${1}/rootfs.squashfs" local overlay_img="${1}/overlay.ext4" @@ -50,15 +50,15 @@ function hassio_hdd_image() { # Partition layout boot_offset="$(sgdisk -F ${hdd_img})" - sgdisk -n 1:0:+${BOOT_SIZE} -c 1:"hassio-boot" -t 1:"C12A7328-F81F-11D2-BA4B-00A0C93EC93B" -u 1:${BOOT_UUID} ${hdd_img} + sgdisk -n 1:0:+${BOOT_SIZE} -c 1:"hassos-boot" -t 1:"C12A7328-F81F-11D2-BA4B-00A0C93EC93B" -u 1:${BOOT_UUID} ${hdd_img} rootfs_offset="$(sgdisk -F ${hdd_img})" - sgdisk -n 2:0:+${SYSTEM_SIZE} -c 2:"hassio-system0" -t 2:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 2:${SYSTEM0_UUID} ${hdd_img} - sgdisk -n 3:0:+${SYSTEM_SIZE} -c 3:"hassio-system1" -t 3:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 3:${SYSTEM1_UUID} ${hdd_img} - sgdisk -n 4:0:+${BOOTSTATE_SIZE} -c 4:"hassio-bootstate" -u 4:${BOOTSTATE_UUID} ${hdd_img} + sgdisk -n 2:0:+${SYSTEM_SIZE} -c 2:"hassos-system0" -t 2:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 2:${SYSTEM0_UUID} ${hdd_img} + sgdisk -n 3:0:+${SYSTEM_SIZE} -c 3:"hassos-system1" -t 3:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 3:${SYSTEM1_UUID} ${hdd_img} + sgdisk -n 4:0:+${BOOTSTATE_SIZE} -c 4:"hassos-bootstate" -u 4:${BOOTSTATE_UUID} ${hdd_img} overlay_offset="$(sgdisk -F ${hdd_img})" - sgdisk -n 5:0:+${OVERLAY_SIZE} -c 5:"hassio-overlay" -t 5:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 5:${OVERLAY_UUID} ${hdd_img} + sgdisk -n 5:0:+${OVERLAY_SIZE} -c 5:"hassos-overlay" -t 5:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 5:${OVERLAY_UUID} ${hdd_img} data_offset="$(sgdisk -F ${hdd_img})" - sgdisk -n 6:0:+${DATA_SIZE} -c 6:"hassio-data" -t 6:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 6:${DATA_UUID} ${hdd_img} + sgdisk -n 6:0:+${DATA_SIZE} -c 6:"hassos-data" -t 6:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 6:${DATA_UUID} ${hdd_img} sgdisk -v # Write Images diff --git a/buildroot-external/scripts/post-build.sh b/buildroot-external/scripts/post-build.sh index 745de9bea..2aa60fdbd 100755 --- a/buildroot-external/scripts/post-build.sh +++ b/buildroot-external/scripts/post-build.sh @@ -1,27 +1,27 @@ #!/bin/bash set -e -SCRIPT_DIR=${BR2_EXTERNAL_HASSIO_PATH}/scripts +SCRIPT_DIR=${BR2_EXTERNAL_HASSOS_PATH}/scripts BOARD_DIR=${2} -. ${SCRIPT_DIR}/rootfs_layer.sh -. ${BR2_EXTERNAL_HASSIO_PATH}/info +. ${SCRIPT_DIR}/rootfs-layer.sh +. ${BR2_EXTERNAL_HASSOS_PATH}/info . ${BOARD_DIR}/info -# Hass.io OS tasks +# HassOS tasks fix_rootfs -install_hassio_cli +install_hassos_cli # Write os-release ( - echo "NAME=Hass.io" + echo "NAME=${HASSOS_NAME}" echo "VERSION=\"${VERSION_MAJOR}.${VERSION_BUILD} (${BOARD_NAME})\"" - echo "ID=hassio-os" + echo "ID=${HASSOS_ID}" echo "VERSION_ID=${VERSION_MAJOR}.${VERSION_BUILD}" - echo "PRETTY_NAME=\"${HASSIO_NAME} ${VERSION_MAJOR}.${VERSION_BUILD}\"" - echo "CPE_NAME=cpe:2.3:o:home_assistant:hassio:${VERSION_MAJOR}.${VERSION_BUILD}:*:${DEPLOYMENT}:*:*:*:${BOARD_ID}:*" + echo "PRETTY_NAME=\"${HASSOS_NAME} ${VERSION_MAJOR}.${VERSION_BUILD}\"" + echo "CPE_NAME=cpe:2.3:o:home_assistant:${HASSOS_ID}:${VERSION_MAJOR}.${VERSION_BUILD}:*:${DEPLOYMENT}:*:*:*:${BOARD_ID}:*" echo "HOME_URL=https://hass.io/" - echo "VARIANT=\"Hass.io ${BOARD_NAME}\"" + echo "VARIANT=\"${HASSOS_NAME} ${BOARD_NAME}\"" echo "VARIANT_ID=${BOARD_ID}" ) > ${TARGET_DIR}/usr/lib/os-release diff --git a/buildroot-external/scripts/rootfs_layer.sh b/buildroot-external/scripts/rootfs-layer.sh similarity index 68% rename from buildroot-external/scripts/rootfs_layer.sh rename to buildroot-external/scripts/rootfs-layer.sh index 3b332aa2f..d18277880 100644 --- a/buildroot-external/scripts/rootfs_layer.sh +++ b/buildroot-external/scripts/rootfs-layer.sh @@ -18,12 +18,15 @@ function fix_rootfs() { rm -rf ${TARGET_DIR}/srv rm -rf ${TARGET_DIR}/opt - # Fix tempfs + # Fix: tempfs with /srv sed -i "/srv/d" ${TARGET_DIR}/usr/lib/tmpfiles.d/home.conf + + # Fix: Could not generate persistent MAC address + sed -i "s/MACAddressPolicy=persistent/MACAddressPolicy=none/g" ${TARGET_DIR}/usr/lib/systemd/network/99-default.link } -function install_hassio_cli() { +function install_hassos_cli() { - sed -i "s|\(root.*\)/bin/sh|\1/usr/sbin/hassio-cli|" ${TARGET_DIR}/etc/passwd + sed -i "s|\(root.*\)/bin/sh|\1/usr/sbin/hassos-cli|" ${TARGET_DIR}/etc/passwd }