home-assistant · pvizeli · Feb 18, 2020 · Feb 6, 2020 · Feb 10, 2020 · Feb 16, 2020
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -16,7 +16,7 @@
 **Supervisor logs:**
 <!--
 - Frontend -> Hass.io -> System
-- Or use this command: hassio su logs
+- Or use this command: ha su logs
 -->
 
 **Journal logs:**

diff --git a/Documentation/configuration.md b/Documentation/configuration.md
@@ -19,7 +19,7 @@ hassos-xy.raucb
 - The `modules` folder is for modules-load configuration files.
 - The `modprobe` folder is for modules configuration files (/etc/modprobe.d)
 - The `udev` folder is for udev rules files.
-- The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Hassio][debug-hassio].
+- The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Home Assistant][debug-homeassistant].
 - The `timesyncd.conf` file allow you to set different NTP servers. HassOS won't boot without correct working time servers!
 - The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page.
 
@@ -57,4 +57,4 @@ FallbackNTP=0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org
 [systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html
 [network.md]: network.md
 [hassos-release]: https://github.com/home-assistant/hassos/releases/
-[debug-hassio]: https://developers.home-assistant.io/docs/en/hassio_debugging.html
+[debug-homeassistant]: https://developers.home-assistant.io/docs/en/hassio_debugging.html
diff --git a/Documentation/development.md b/Documentation/development.md
@@ -5,14 +5,19 @@
 `BOOT_SYS`:
 - efi
 - hyprid
-- spl
 - mbr
 
 HassOS is basicly used GPT. But for use GPT we need own the first 1024 of
 boot drive. Is that not possible, you can use MBR for your device, they work also with SPLs.
 
 Hyprid and SPL use both a hyprid MBR/GPT table but SPL move the GPT header 8MB for give space to write SPL and boot images before.
 
+`BOOT_SPL`:
+- true
+- false
+
+Enable SPL update handling.
+
 `BOOTLOADER`:
 - uboot
 - barebox

diff --git a/Documentation/getting_started_development.md b/Documentation/getting_started_development.md
@@ -101,6 +101,6 @@ $ /usr/bin/qemu-system-x86_64 -enable-kvm -name hassos_ova -smp 2 -m 1024 -drive
 
 This should pop up qemu's SDL frontend, displaying _hassos_' VT/CLI environment. Specifying addtional options and flags to qemu for network access, keyboard layout et al. are left as an exercise for the reader.
 
-After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *hassio>* shell prompt will yield a root shell in the host OS.
+After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *ha>* shell prompt will yield a root shell in the host OS.
 
 Happy hacking! :)
diff --git a/Documentation/network.md b/Documentation/network.md
@@ -106,12 +106,12 @@ powersave=0
 Log into the HASSOS base system via a console:
 
 ```
-Welcome to HassOS
-Hassio login:
+Welcome to Home Assistant
+homeassistant login:
 ```
 Login as `root` (no password needed)
 
-At the `hassio >` prompt, type `login` (as instructed).
+At the `ha >` prompt, type `login` (as instructed).
 
 From here you will use the `nmcli` configuration tool.
 

diff --git a/buildroot-external/board/asus/tinker/meta b/buildroot-external/board/asus/tinker/meta
@@ -3,5 +3,6 @@ BOARD_NAME="Asus TinkerBoard"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=spl
+BOOT_SYS=hyprid
+BOOT_SPL=true
 BOOT_ENV_SIZE=0x8000
diff --git a/buildroot-external/board/hardkernel/odroid-c2/kernel.config b/buildroot-external/board/hardkernel/odroid-c2/kernel.config
@@ -382,7 +382,10 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_COMPAT=y
 CONFIG_KUSER_HELPERS=y
-# CONFIG_ARMV8_DEPRECATED is not set
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
 
 #
 # ARMv8.1 architectural features

diff --git a/buildroot-external/board/hardkernel/odroid-c2/meta b/buildroot-external/board/hardkernel/odroid-c2/meta
@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
 BOOT_SYS=mbr
+BOOT_SPL=true
 BOOT_ENV_SIZE=0x2000
diff --git a/buildroot-external/board/hardkernel/odroid-n2/kernel.config b/buildroot-external/board/hardkernel/odroid-n2/kernel.config
@@ -382,7 +382,10 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_COMPAT=y
 CONFIG_KUSER_HELPERS=y
-# CONFIG_ARMV8_DEPRECATED is not set
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
 
 #
 # ARMv8.1 architectural features

diff --git a/buildroot-external/board/hardkernel/odroid-n2/meta b/buildroot-external/board/hardkernel/odroid-n2/meta
@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
 BOOT_SYS=mbr
+BOOT_SPL=true
 BOOT_ENV_SIZE=0x2000
diff --git a/buildroot-external/board/hardkernel/odroid-xu4/meta b/buildroot-external/board/hardkernel/odroid-xu4/meta
@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=mbr
+BOOT_SPL=true
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/board/intel/nuc/meta b/buildroot-external/board/intel/nuc/meta
@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=barebox
 KERNEL_FILE=bzImage
 BOOT_SYS=efi
+BOOT_SPL=false
 DISK_SIZE=6
diff --git a/buildroot-external/board/intel/ova/meta b/buildroot-external/board/intel/ova/meta
@@ -4,4 +4,5 @@ CHASSIS=vm
 BOOTLOADER=barebox
 KERNEL_FILE=bzImage
 BOOT_SYS=efi
+BOOT_SPL=false
 DISK_SIZE=6
diff --git a/buildroot-external/board/raspberrypi/rpi/meta b/buildroot-external/board/raspberrypi/rpi/meta
@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/board/raspberrypi/rpi0-w/meta b/buildroot-external/board/raspberrypi/rpi0-w/meta
@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/board/raspberrypi/rpi2/meta b/buildroot-external/board/raspberrypi/rpi2/meta
@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/board/raspberrypi/rpi3-64/meta b/buildroot-external/board/raspberrypi/rpi3-64/meta
@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/board/raspberrypi/rpi3/meta b/buildroot-external/board/raspberrypi/rpi3/meta
@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/board/raspberrypi/rpi4-64/meta b/buildroot-external/board/raspberrypi/rpi4-64/meta
@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/board/raspberrypi/rpi4/meta b/buildroot-external/board/raspberrypi/rpi4/meta
@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/busybox.config b/buildroot-external/busybox.config
@@ -320,7 +320,7 @@ CONFIG_TRUE=y
 CONFIG_TRUNCATE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
-CONFIG_UNAME_OSNAME="Hassio/OS"
+CONFIG_UNAME_OSNAME="HassOS"
 CONFIG_UNIQ=y
 CONFIG_UNLINK=y
 CONFIG_USLEEP=y

diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig
@@ -8,8 +8,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -99,10 +99,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/intel-nuc-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
 BR2_PACKAGE_HASSOS_CLI_VERSION="16"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig
@@ -8,8 +8,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -93,10 +93,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-c2-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
 BR2_PACKAGE_HASSOS_CLI_VERSION="16"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig
@@ -8,8 +8,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -93,10 +93,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-n2-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
 BR2_PACKAGE_HASSOS_CLI_VERSION="16"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig
@@ -9,8 +9,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -98,10 +98,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-xu-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
 BR2_PACKAGE_HASSOS_CLI_VERSION="16"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig
@@ -8,8 +8,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -89,10 +89,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/qemux86-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
 BR2_PACKAGE_HASSOS_CLI_VERSION="16"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig
@@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -96,10 +96,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
 BR2_PACKAGE_HASSOS_CLI_VERSION="16"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig
@@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -95,10 +95,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi2-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
 BR2_PACKAGE_HASSOS_CLI_VERSION="16"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig
@@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -96,10 +96,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
 BR2_PACKAGE_HASSOS_CLI_VERSION="16"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig
@@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -96,10 +96,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
 BR2_PACKAGE_HASSOS_CLI_VERSION="16"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y