Merge pull request #85 from home-assistant/dev

Beta 2.0

Documentation/configuration.md

@@ -2,7 +2,9 @@
 
 ## Automatic
 
-You can format a USB stick with FAT32/EXT4 and name it with `CONFIG`. The layout could be look like:
+You can use a USB drive with HassOS to configure network options, ssh access to the host, and to install updates.
+Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG`. Use the following directory structure within the USB drive:
+
 ```
 network/
 modules/
@@ -10,13 +12,13 @@ authorized_keys
 hassos-xy.raucb
 ```
 
-- On `network` folder can hold any kind of NetworkManager connections files.
-- The folder `modules` is for modules-load configuration files.
-- `authorized_keys` file activate debug SSH access of port `22222`.
-- For firmware updates you can but the `hassos-*.raucb` OTA update they should be install.
+- The `network` folder can contain any kind of NetworkManager connection files. For more information see [Network][network.md]. 
+- The `modules` folder is for modules-load configuration files.
+- The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Hassio][debug-hassio].
+- The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page. 
 
-You can put this USB stick into device and they will be read on startup. You can also trigger this process later over the
-API/UI or call `systemctl restart hassos-config` on host.
+You can put this USB stick into the device and it will be read on startup. You can also trigger this process later over the
+API/UI or by calling `systemctl restart hassos-config` on the host.
 
 ## Local
 
@@ -33,3 +35,6 @@ The kernel module folder `/etc/modules-load.d` is persistent and you can add you
 You can manual add, edit or remove connections configs from `/etc/NetworkManager/system-connections`.
 
 [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

Documentation/network.md

@@ -1,18 +1,35 @@
 # Network
 
-HassOS use NetworkManager to control the host network. You can setup the network configuartion in future over the API/UI.
-Actual we support only manual configuration with NetworkManager connection files. Without a configuration, we run default as
-DHCP device.
+HassOS uses NetworkManager to control the host network. In future releases, you can set up the configuration using the API/UI.
+Currently only manual configuration using NetworkManager connection files is supported. Without a configuration file, the device will use DHCP by default. These network connection files can be placed on a USB drive as described in [Configuration][configuration-usb].
 
 ## Configuration Examples
 
-You can look also into [Official Manual][keyfile] or there are a lot of examples accross internet.
+You can look also into [Official Manual][keyfile] or there are a lot of examples accross internet. The system is read only, if you not want change the IP address every boot, you should set the uuid property with a generic [UUID4][uuid].
+
+### Default
+
+We have a preinstalled connection profile:
+```
+[connection]
+id=HassOS default
+uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add
+type=802-3-ethernet
+
+[ipv4]
+method=auto
+
+[ipv6]
+addr-gen-mode=stable-privacy
+method=auto
+```
 
 ### LAN
 ```ini
 [connection]
 id=hassos-network
-type=ethernet
+uuid=d55162b4-6152-4310-9312-8f4c54d86afa
+type=802-3-ethernet
 
 [ipv4]
 method=auto
@@ -26,7 +43,8 @@ method=auto
 ```ini
 [connection]
 id=hassos-network
-type=wifi
+uuid=72111c67-4a5d-4d5c-925e-f8ee26efb3c3
+type=802-11-wireless
 
 [wifi]
 mode=infrastructure
@@ -55,4 +73,26 @@ address1=192.168.1.111/24,192.168.1.1
 dns=8.8.8.8;8.8.4.4;
 ```
 
+## Tips
+
+### Reset network
+
+If you want reset the network configuration to default, use follow commands on host:
+```bash
+$ rm /etc/NetworkManager/system-connections/*
+$ cp /usr/share/system-connections/* /etc/NetworkManager/system-connections/
+$ nmcli con reload
+```
+
+### Powersave
+
+If you have trouble with powersave you can do following:
+```ini
+[wifi]
+# Values are 0 (use default), 1 (ignore/don't touch), 2 (disable) or 3 (enable).
+powersave=0
+```
+
 [keyfile]: https://developer.gnome.org/NetworkManager/stable/nm-settings.html
+[configuration-usb]: configuration.md
+[uuid]: https://www.uuidgenerator.net/

buildroot-external/board/raspberrypi/rpi3-64/uboot-boot.sh

@@ -3,7 +3,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait cgroup_enable=memory"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
@@ -49,3 +49,6 @@ echo "Loading kernel"
 run load_kernel
 echo " Starting kernel"
 booti ${kernel_addr_r} - ${fdt_addr}
+
+echo "Fails on boot"
+reset

buildroot-external/board/raspberrypi/uboot-boot.sh

@@ -3,7 +3,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait cgroup_enable=memory"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
@@ -49,3 +49,6 @@ echo "Loading kernel"
 run load_kernel
 echo " Starting kernel"
 bootz ${kernel_addr_r} - ${fdt_addr}
+
+echo "Fails on boot"
+reset

buildroot-external/configs/ova_defconfig

@@ -40,6 +40,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -73,12 +75,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="109"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
 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_CLI="homeassistant/amd64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="5"
+BR2_PACKAGE_HASSOS_CLI_VERSION="6"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi0_w_defconfig

@@ -48,6 +48,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -82,12 +84,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="109"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
 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_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="5"
+BR2_PACKAGE_HASSOS_CLI_VERSION="6"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi2_defconfig

@@ -47,6 +47,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -81,12 +83,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="109"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
 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_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="5"
+BR2_PACKAGE_HASSOS_CLI_VERSION="6"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi3_64_defconfig

@@ -48,6 +48,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -82,12 +84,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="109"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
 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_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="5"
+BR2_PACKAGE_HASSOS_CLI_VERSION="6"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi3_defconfig

@@ -48,6 +48,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -82,12 +84,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="109"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
 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_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="5"
+BR2_PACKAGE_HASSOS_CLI_VERSION="6"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi_defconfig

@@ -47,6 +47,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -81,12 +83,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="109"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
 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_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="5"
+BR2_PACKAGE_HASSOS_CLI_VERSION="6"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/info

@@ -1,7 +1,7 @@
-VERSION_MAJOR=1
-VERSION_BUILD=1
+VERSION_MAJOR=2
+VERSION_BUILD=0
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"
 
-DEPLOYMENT="staging"
+DEPLOYMENT="development"

buildroot-external/rootfs-overlay/etc/NetworkManager/NetworkManager.conf

@@ -6,3 +6,6 @@ rc-manager=file
 
 [keyfile]
 unmanaged-devices=type:bridge;type:tun;type:veth
+
+[logging]
+backend=journal

buildroot-external/rootfs-overlay/etc/systemd/system/NetworkManager.service.d/hassos.conf

@@ -0,0 +1,2 @@
+[Unit]
+RequiresMountsFor=/etc/hostname /etc/hosts /etc/NetworkManager/system-connections

buildroot-external/rootfs-overlay/etc/systemd/system/avahi-daemon.service.d/hassos.conf

@@ -0,0 +1,2 @@
+[Unit]
+RequiresMountsFor=/etc/hostname

buildroot-external/rootfs-overlay/etc/systemd/system/avahi-daemon.service.d/nm.conf

@@ -0,0 +1,3 @@
+[Unit]
+Wants=network-online.target
+After=network-online.target

buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/hassos.conf

@@ -0,0 +1,3 @@
+[Unit]
+Wants=hassos-supervisor.service
+After=hassos-supervisor.service

buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-NetworkManager.mount

@@ -0,0 +1 @@
+/usr/lib/systemd/system/var-lib-NetworkManager.mount

buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-persists-journald.service

@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-persists-journald.service

buildroot-external/rootfs-overlay/etc/systemd/system/serial-getty@.service.d/docker.conf

@@ -0,0 +1,3 @@
+[Unit]
+Requires=docker.service
+After=docker.service

buildroot-external/rootfs-overlay/etc/systemd/system/serial-getty@.service.d/hassos.conf

@@ -1,3 +1,3 @@
 [Unit]
-Requires=docker.service
-After=docker.service
+Wants=hassos-supervisor.service
+After=hassos-supervisor.service

buildroot-external/rootfs-overlay/etc/tmpfiles.d/nm.conf

@@ -0,0 +1,3 @@
+# Cleanup lease files
+e /var/lib/NetworkManager/*.lease - - - 14d
+C /mnt/overlay/etc/NetworkManager/system-connections - - - - /usr/share/system-connections

buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\x2dconnections.mount

@@ -1,7 +1,7 @@
 [Unit]
 Description=NetworkManager persistent system connections
 Requires=mnt-overlay.mount
-After=mnt-overlay.mount
+After=mnt-overlay.mount systemd-tmpfiles-setup.service
 Before=NetworkManager.service hassos-config.service
 
 [Mount]

buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-persists-journald.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=HassOS persists journald
+Requires=var-log-journal.mount
+After=sysinit.target systemd-journald.service
+RefuseManualStart=true
+RefuseManualStop=true
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/hassos-persists-journald
+RemainAfterExit=true
+
+[Install]
+WantedBy=multi-user.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service

@@ -1,7 +1,8 @@
 [Unit]
 Description=HassOS supervisor
 Requires=docker.service
-After=docker.service rauc.service dbus.socket
+Wants=network-online.target
+After=docker.service rauc.service dbus.socket network-online.target
 RequiresMountsFor=/mnt/data
 StartLimitIntervalSec=60
 StartLimitBurst=5

buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-NetworkManager.mount

@@ -0,0 +1,14 @@
+[Unit]
+Description=NetworkManager persistent data
+Requires=mnt-data.mount
+After=mnt-data.mount
+Before=NetworkManager.service
+
+[Mount]
+What=/mnt/overlay/var/lib/NetworkManager
+Where=/var/lib/NetworkManager
+Type=none
+Options=bind
+
+[Install]
+WantedBy=hassos-bind.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-docker.mount

@@ -1,6 +1,6 @@
 [Unit]
 Description=Docker persistent data
-Requires=mnt-data.mount docker.service
+Requires=mnt-data.mount
 After=mnt-data.mount
 Before=docker.service
 

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}
 

buildroot-external/rootfs-overlay/usr/sbin/hassos-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if ! findfs LABEL="config" > /dev/null; then
+if ! findfs LABEL="CONFIG" > /dev/null; then
     echo "[Warning] No config partition found"
     exit 0
 fi
@@ -19,6 +19,7 @@ if [ -d /mnt/config/network ]; then
 
     rm -rf /etc/NetworkManager/system-connections/*
     cp -f /mnt/config/network/* /etc/NetworkManager/system-connections/
+    chmod 600 /etc/NetworkManager/system-connections/*
 
     nmcli con reload
 fi
@@ -48,7 +49,8 @@ fi
 
 ##
 # Firmware update
-if ls /mnt/config/*.raucb > /dev/null; then
+UPTIME=$(awk '{printf "%0.f", $1}' /proc/uptime)
+if ls /mnt/config/*.raucb > /dev/null && [ ${UPTIME} -ge 180 ]; then
     echo "[Info] Performe a firmware update"
 
     rauc_filename=$(ls /mnt/config/*.raucb | head -n 1)

buildroot-external/rootfs-overlay/usr/sbin/hassos-persists-journald

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+MACHINE_ID=$(cat /etc/machine-id)
+CURRENT_LOGS=/var/log/journal/${MACHINE_ID}
+
+# Loop all logs folder and move
+for log_folder in /var/log/journal/*; do
+    # Not a log folder
+    if [ ! -d ${log_folder} ]; then
+        continue
+    fi
+    
+    # Current log folder
+    if (echo ${log_folder} | grep ${MACHINE_ID}); then
+        continue
+    fi
+    
+    rm -rf ${log_folder}
+done
+

buildroot-external/rootfs-overlay/usr/sbin/hassos-rate

@@ -15,12 +15,12 @@ function mark_bad() {
 #### Check system ####
 
 # Docker state
-if ! systemctl -q is-active docker; then
+if systemctl -q is-failed docker; then
     mark_bad
 fi
 
 # Docker state
-if ! systemctl -q is-active hassos-supervisor; then
+if systemctl -q is-failed hassos-supervisor; then
     mark_bad
 fi
 

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}
 }

buildroot-external/rootfs-overlay/usr/share/system-connections/default

@@ -0,0 +1,11 @@
+[connection]
+id=HassOS default
+uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add
+type=802-3-ethernet
+
+[ipv4]
+method=auto
+
+[ipv6]
+addr-gen-mode=stable-privacy
+method=auto

buildroot-external/scripts/rootfs-layer.sh

@@ -2,10 +2,6 @@
 
 function fix_rootfs() {
 
-    # Cleanup DHCP service, we don't need this with NetworkManager
-    rm -rf ${TARGET_DIR}/etc/systemd/system/multi-user.target.wants/dhcpcd.service
-    rm -rf ${TARGET_DIR}/usr/lib/systemd/system/dhcpcd.service
-
     # Cleanup etc
     rm -rf ${TARGET_DIR}/etc/init.d
     rm -rf ${TARGET_DIR}/etc/network
@@ -20,6 +16,9 @@ function fix_rootfs() {
     # Cleanup miscs
     rm -rf ${TARGET_DIR}/usr/lib/modules-load.d
 
+    # Fix: permission for system connection files
+    chmod 600 ${TARGET_DIR}/usr/share/system-connections/*
+
     # Fix: tempfs with /srv
     sed -i "/srv/d" ${TARGET_DIR}/usr/lib/tmpfiles.d/home.conf
 
@@ -31,4 +30,8 @@ function fix_rootfs() {
 function install_hassos_cli() {
 
     sed -i "s|\(root.*\)/bin/sh|\1/usr/sbin/hassos-cli|" ${TARGET_DIR}/etc/passwd
+    
+    if ! grep "hassos-cli" ${TARGET_DIR}/etc/shells; then
+        echo "/usr/sbin/hassos-cli" >> ${TARGET_DIR}/etc/shells
+    fi
 }

buildroot-patches/0008-Fix-dhcp-client.patch

@@ -0,0 +1,27 @@
+From 07169ea27b84230299685f84031f07f8af74dbb4 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Wed, 4 Jul 2018 20:31:14 +0000
+Subject: [PATCH 1/1] Fix dhcp client
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ package/dhcp/dhcp.mk | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
+index a1285184d3..7ea7589a28 100644
+--- a/package/dhcp/dhcp.mk
++++ b/package/dhcp/dhcp.mk
+@@ -75,8 +75,7 @@ endif
+ 
+ ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
+ define DHCP_INSTALL_CLIENT
+-	mkdir -p $(TARGET_DIR)/var/lib
+-	(cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
++	mkdir -p $(TARGET_DIR)/var/lib/dhcp
+ 	$(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \
+ 		$(TARGET_DIR)/sbin/dhclient
+ 	$(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \
+-- 
+2.17.1
+

buildroot-patches/0009-NetworkManager-allow-to-wait-on-boot.patch

@@ -0,0 +1,34 @@
+From 590565bc07f563f978004727dc817dc89527377a Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Sat, 31 Mar 2018 16:58:14 +0200
+Subject: [PATCH 1/1] NetworkManager: allow to wait on boot
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ package/network-manager/network-manager.mk | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
+index a520aad..fb2012a 100644
+--- a/package/network-manager/network-manager.mk
++++ b/package/network-manager/network-manager.mk
+@@ -93,6 +93,7 @@ endef
+ 
+ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
+ 	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
++	mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants
+ 
+ 	ln -sf /usr/lib/systemd/system/NetworkManager.service \
+ 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
+@@ -100,6 +101,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
+ 	ln -sf /usr/lib/systemd/system/NetworkManager.service \
+ 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service
+ 
++	ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \
++		$(TARGET_DIR)/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service
++
+ 	ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \
+ 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
+ endef
+-- 
+2.7.4

buildroot/package/dhcp/dhcp.mk

@@ -75,8 +75,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
 define DHCP_INSTALL_CLIENT
-	mkdir -p $(TARGET_DIR)/var/lib
-	(cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
+	mkdir -p $(TARGET_DIR)/var/lib/dhcp
 	$(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \
 		$(TARGET_DIR)/sbin/dhclient
 	$(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \

buildroot/package/network-manager/network-manager.mk

@@ -93,6 +93,7 @@ endef
 
 define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
 	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants
 
 	ln -sf /usr/lib/systemd/system/NetworkManager.service \
 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
@@ -100,6 +101,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
 	ln -sf /usr/lib/systemd/system/NetworkManager.service \
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service
 
+	ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \
+		$(TARGET_DIR)/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service
+
 	ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \
 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
 endef