Raspberry: update kernel 4.14.78

* OS: Config importer support now also boot partition

* Update configuration.md

* Cleanup config after import

* Update hassos-config

Documentation/configuration.md

@@ -2,18 +2,20 @@
 
 ## Automatic
 
-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:
+You can use an 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`. Alternative you can create a `CONFIG` folder inside boot partition. Use the following directory structure within the USB drive:
 
 ```
 network/
 modules/
+udev/
 authorized_keys
 hassos-xy.raucb
 ```
 
 - 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 `udev` folder is for udev rules 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. 
 
@@ -30,6 +32,10 @@ You can edit or create a `cmdline.txt` into your boot partition. That will be re
 
 The kernel module folder `/etc/modules-load.d` is persistent and you can add your config files there. See [Systemd modules load][systemd-modules].
 
+### Udev rules
+
+The udev rules folder `/etc/udev/rules.d` is persistent and you can add your configuration files there.
+
 ### Network
 
 You can manual add, edit or remove connections configs from `/etc/NetworkManager/system-connections`.

Documentation/kernel.md

@@ -3,5 +3,5 @@
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Applicance | 4.14.67 |
-| Raspberry Pi | 4.14.66 |
+| Open Virtual Applicance | 4.14.78 |
+| Raspberry Pi | 4.14.78 |

buildroot-external/board/ova/kernel.config

@@ -15,3 +15,4 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_BLK=m
 
+CONFIG_USB_XHCI_HCD=y

buildroot-external/board/raspberrypi/kernel.config

@@ -0,0 +1 @@
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

buildroot-external/bootloader/barebox/boot/system0

@@ -3,6 +3,6 @@
 global linux.bootargs.dyn.root="root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
 
 mkdir -p /mnt/system
-mount -t ext4 /dev/disk0.hassos-kernel0 /mnt/system
+mount -t ext4 /dev/disk*.hassos-kernel0 /mnt/system
 
 global bootm.image="/mnt/system/bzImage"

buildroot-external/bootloader/barebox/boot/system1

@@ -3,6 +3,6 @@
 global linux.bootargs.dyn.root="root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
 
 mkdir -p /mnt/system
-mount -t ext4 /dev/disk0.hassos-kernel1 /mnt/system
+mount -t ext4 /dev/disk*.hassos-kernel1 /mnt/system
 
 global bootm.image="/mnt/system/bzImage"

buildroot-external/configs/ova_defconfig

@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova/post-image.s
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.67"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.78"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -77,12 +77,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="127"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="138"
 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="6"
+BR2_PACKAGE_HASSOS_CLI_VERSION="7"
 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

@@ -21,9 +21,9 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6da082a790f857d5163ac99357beae6b59f1eb5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="961aa2356a25ad04528e91761e7081a25dc983dc"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w"
@@ -86,12 +86,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="127"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="138"
 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="6"
+BR2_PACKAGE_HASSOS_CLI_VERSION="7"
 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

@@ -21,9 +21,9 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6da082a790f857d5163ac99357beae6b59f1eb5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="961aa2356a25ad04528e91761e7081a25dc983dc"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"
@@ -85,12 +85,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="127"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="138"
 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="6"
+BR2_PACKAGE_HASSOS_CLI_VERSION="7"
 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

@@ -21,9 +21,9 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6da082a790f857d5163ac99357beae6b59f1eb5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="961aa2356a25ad04528e91761e7081a25dc983dc"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2837-rpi-3-b broadcom/bcm2710-rpi-3-b-plus"
@@ -86,12 +86,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="127"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="138"
 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="6"
+BR2_PACKAGE_HASSOS_CLI_VERSION="7"
 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

@@ -21,9 +21,9 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6da082a790f857d5163ac99357beae6b59f1eb5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="961aa2356a25ad04528e91761e7081a25dc983dc"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"
@@ -86,12 +86,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="127"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="138"
 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="6"
+BR2_PACKAGE_HASSOS_CLI_VERSION="7"
 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

@@ -21,9 +21,9 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6da082a790f857d5163ac99357beae6b59f1eb5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="961aa2356a25ad04528e91761e7081a25dc983dc"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
@@ -85,12 +85,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="127"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="138"
 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="6"
+BR2_PACKAGE_HASSOS_CLI_VERSION="7"
 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,5 +1,5 @@
 VERSION_MAJOR=1
-VERSION_BUILD=10
+VERSION_BUILD=12
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.mk

@@ -24,8 +24,8 @@ define BLUETOOTH_BCM43XX_INSTALL_TARGET_CMDS
 	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
 	$(INSTALL) -m 0644 $(@D)/*.hcd $(TARGET_DIR)/lib/firmware/brcm/
 
-	$(INSTALL) -d $(TARGET_DIR)/etc/udev/rules.d
-	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.rules $(TARGET_DIR)/etc/udev/rules.d/
+	$(INSTALL) -d $(TARGET_DIR)/usr/lib/udev/rules.d
+	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.rules $(TARGET_DIR)/usr/lib/udev/rules.d/
 endef
 
 $(eval $(generic-package))

buildroot-external/rootfs-overlay/etc/acpi/PWRF/00000080

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# This script is exec()d by acpid when an ACPI event signals the power button
+# to have been pressed.
+
+echo "System power button was pressed - shutting down..."
+exec /bin/systemctl poweroff

buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-udev-rules.d.mount

@@ -0,0 +1 @@
+/usr/lib/systemd/system/etc-udev-rules.d.mount

buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/busybox-acpid.service

@@ -0,0 +1 @@
+/usr/lib/systemd/system/busybox-acpid.service

buildroot-external/rootfs-overlay/usr/lib/systemd/system/busybox-acpid.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=acpid (busybox)
+RefuseManualStop=true
+ConditionPathIsDirectory=/proc/acpi
+
+[Service]
+Type=simple
+ExecStart=/sbin/acpid -d
+
+[Install]
+After=local-fs.target
+WantedBy=multi-user.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-udev-rules.d.mount

@@ -0,0 +1,14 @@
+[Unit]
+Description=Udev persistent rules.d
+Requires=mnt-overlay.mount
+After=mnt-overlay.mount
+Before=systemd-udevd.service hassos-config.service
+
+[Mount]
+What=/mnt/overlay/etc/udev/rules.d
+Where=/etc/udev/rules.d
+Type=None
+Options=bind
+
+[Install]
+WantedBy=hassos-bind.target

buildroot-external/rootfs-overlay/usr/lib/udev/rules.d/hmip-rfusb.rules

@@ -0,0 +1 @@
+ACTION=="add", ATTRS{idVendor}=="1b1f", ATTRS{idProduct}=="c020", RUN+="/sbin/modprobe cp210x" RUN+="/bin/sh -c 'echo 1b1f c020 >/sys/bus/usb-serial/drivers/cp210x/new_id'"

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

@@ -1,60 +1,88 @@
 #!/bin/sh
 
-if ! findfs LABEL="CONFIG" > /dev/null; then
+BOOT_CONFIG="/mnt/boot/CONFIG"
+USB_CONFIG="/mnt/config"
+CONFIG_DIR=""
+USE_USB=0
+
+# Check and mount usb CONFIG to folder
+if findfs LABEL="CONFIG" > /dev/null 2>&1; then
+    echo "[Info] Use USB stick for import CONFIG"
+
+    systemctl start mnt-config.mount
+    if ! systemctl -q is-active mnt-config.mount; then
+        echo "[Error] Can't mount config partition"
+        exit 1
+    fi
+
+    USE_USB=1
+    CONFIG_DIR=${USB_CONFIG}
+fi
+
+# Use boot CONFIG folder
+if [ ${USE_USB} = 0 ] && [ -d ${BOOT_CONFIG} ]; then
+    echo "[Info] Use boot partition for import CONFIG"
+    CONFIG_DIR=${BOOT_CONFIG}
+elif [ ${USE_USB} = 0 ]; then
     echo "[Warning] No config partition found"
     exit 0
 fi
 
-# Mount config folder
-systemctl start mnt-config.mount
-if ! systemctl -q is-active mnt-config.mount; then
-    echo "[Error] Can't mount config partition"
-    exit 1
-fi
 
 ##
 # NetworkManager
-if [ -d /mnt/config/network ]; then
+if [ -d "${CONFIG_DIR}/network" ]; then
     echo "[Info] Update NetworkManager connections!"
 
     rm -rf /etc/NetworkManager/system-connections/*
-    cp -f /mnt/config/network/* /etc/NetworkManager/system-connections/
+    cp -f ${CONFIG_DIR}/network/* /etc/NetworkManager/system-connections/
     chmod 600 /etc/NetworkManager/system-connections/*
 
-    nmcli con reload
+    nmcli con reload > /dev/null 2>&1
 fi
 
 ##
 # Modules
-if [ -d /mnt/config/modules ]; then
+if [ -d "${CONFIG_DIR}/modules" ]; then
     echo "[Info] Update Modules configuration!"
 
     rm -rf /etc/modules-load.d/*
-    cp -f /mnt/config/modules/* /etc/modules-load.d/*
+    cp -f ${CONFIG_DIR}/modules/* /etc/modules-load.d/*
+fi
+
+##
+# Udev
+if [ -d "${CONFIG_DIR}/udev" ]; then
+    echo "[Info] Update Udev configuration!"
+
+    rm -rf /etc/udev/rules.d/*
+    cp -f ${CONFIG_DIR}/udev/* /etc/udev/rules.d/*
 fi
 
 ##
 # SSH know hosts
-if [ -f /mnt/config/authorized_keys ]; then
+if [ -f "${CONFIG_DIR}/authorized_keys" ]; then
     echo "[Info] Update SSH authorized_keys!"
 
-    cp -f /mnt/config/authorized_keys /root/.ssh/authorized_keys
+    cp -f ${CONFIG_DIR}/authorized_keys /root/.ssh/authorized_keys
     chmod 600 /root/.ssh/authorized_keys
 
-    systemctl start dropbear
+    systemctl start dropbear > /dev/null 2>&1
 else
+    echo "[Info] Stop SSH debug access"
+
     rm -f /root/.ssh/authorized_keys
-    systemctl stop dropbear
+    systemctl stop dropbear > /dev/null 2>&1
 fi
 
 ##
-# Firmware update
+# Firmware update / Only USB
 UPTIME=$(awk '{printf "%0.f", $1}' /proc/uptime)
-if ls /mnt/config/*.raucb > /dev/null && [ ${UPTIME} -ge 180 ]; then
+if ls ${USB_CONFIG}/*.raucb > /dev/null 2>&1 && [ ${UPTIME} -ge 180 ]; then
     echo "[Info] Performe a firmware update"
 
-    rauc_filename=$(ls /mnt/config/*.raucb | head -n 1)
-    if rauc install ${rauc_filename}; then
+    rauc_filename=$(ls ${USB_CONFIG}/*.raucb | head -n 1)
+    if rauc install "${rauc_filename}"; then
         echo "[Info] Firmware update success"
         systemctl reboot
     else
@@ -63,4 +91,8 @@ if ls /mnt/config/*.raucb > /dev/null && [ ${UPTIME} -ge 180 ]; then
 fi
 
 # Cleanup config partition
-systemctl stop mnt-config.mount
+if [ ${USE_USB} = 1 ]; then
+    systemctl stop mnt-config.mount
+else
+    rm -rf ${BOOT_CONFIG}
+fi

buildroot-patches/0006-Pump-raspberry-pi-firmware-for-kernel-4.14.patch

@@ -16,7 +16,7 @@ index 4854deae03..3a9f21e877 100644
 @@ -1,2 +1,2 @@
  # Locally computed
 -sha256 ea451834e20136d249661e0ed7d1fdfa309249d233a387f44dd6c3b746a454c6 rpi-firmware-36f991382326907419f64917624427e59fd8e4a0.tar.gz
-+sha256 a72ddbd1a4e96ca508fc14d0c31784ec119b68edcab2929c9779ae618db15388 rpi-firmware-200c2f4dd54b2048b5dcb8661ea3f232beb7d81e.tar.gz
++sha256 d9295b794e8a93a9bb8b5fe8cf612fea7f4a22f4a8abbbd3f56a20c96e63428a rpi-firmware-45c6ee3cd7f36a2376b691affbc02dfc689b8056.tar.gz
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
 index eab4c5d307..cb2e9d6cd8 100644
 --- a/package/rpi-firmware/rpi-firmware.mk
@@ -26,7 +26,7 @@ index eab4c5d307..cb2e9d6cd8 100644
  ################################################################################
  
 -RPI_FIRMWARE_VERSION = 36f991382326907419f64917624427e59fd8e4a0
-+RPI_FIRMWARE_VERSION = 200c2f4dd54b2048b5dcb8661ea3f232beb7d81e
++RPI_FIRMWARE_VERSION = 45c6ee3cd7f36a2376b691affbc02dfc689b8056
  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
  RPI_FIRMWARE_LICENSE = BSD-3-Clause
  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

buildroot/package/rpi-firmware/rpi-firmware.hash

@@ -1,2 +1,2 @@
 # Locally computed
-sha256 a72ddbd1a4e96ca508fc14d0c31784ec119b68edcab2929c9779ae618db15388 rpi-firmware-200c2f4dd54b2048b5dcb8661ea3f232beb7d81e.tar.gz
+sha256 d9295b794e8a93a9bb8b5fe8cf612fea7f4a22f4a8abbbd3f56a20c96e63428a rpi-firmware-45c6ee3cd7f36a2376b691affbc02dfc689b8056.tar.gz

buildroot/package/rpi-firmware/rpi-firmware.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 200c2f4dd54b2048b5dcb8661ea3f232beb7d81e
+RPI_FIRMWARE_VERSION = 45c6ee3cd7f36a2376b691affbc02dfc689b8056
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom