From 9bbe607cf6e08bb789539f2d9b78820dd57db0c9 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Tue, 27 Apr 2021 15:15:42 +0200
Subject: [PATCH] Check Config 3.7.0 (#1975)

* Check Config 3.7.0

* Typo

* Bump base image

* Fix S6 Supervisor not listening message
---
 check_config/CHANGELOG.md                              |  7 +++++++
 check_config/build.json                                | 10 +++++-----
 check_config/config.json                               |  5 +++--
 check_config/rootfs/etc/services.d/check-config/finish |  2 +-
 check_config/rootfs/etc/services.d/check-config/run    |  6 +-----
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/check_config/CHANGELOG.md b/check_config/CHANGELOG.md
index ecfb448..160b227 100644
--- a/check_config/CHANGELOG.md
+++ b/check_config/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 3.7.0
+
+- Update base image to 2021.04.2
+- Suppress PIP install output, unless an error occurs
+- Remove udev usage, replaced by uart & usb flag
+- Fix S6 supervisor not listening message
+
 ## 3.6.0
 
 - Change to rsync for copy
diff --git a/check_config/build.json b/check_config/build.json
index 5940a17..cf4e74a 100644
--- a/check_config/build.json
+++ b/check_config/build.json
@@ -1,9 +1,9 @@
 {
   "build_from": {
-    "aarch64": "homeassistant/aarch64-homeassistant-base:8.4.0",
-    "amd64": "homeassistant/amd64-homeassistant-base:8.4.0",
-    "armhf": "homeassistant/armhf-homeassistant-base:8.4.0",
-    "armv7": "homeassistant/armv7-homeassistant-base:8.4.0",
-    "i386": "homeassistant/i386-homeassistant-base:8.4.0"
+    "aarch64": "ghcr.io/home-assistant/aarch64-homeassistant-base:2021.04.2",
+    "amd64": "ghcr.io/home-assistant/amd64-homeassistant-base:2021.04.2",
+    "armhf": "ghcr.io/home-assistant/armhf-homeassistant-base:2021.04.2",
+    "armv7": "ghcr.io/home-assistant/armv7-homeassistant-base:2021.04.2",
+    "i386": "ghcr.io/home-assistant/i386-homeassistant-base:2021.04.2"
   }
 }
diff --git a/check_config/config.json b/check_config/config.json
index 3453d4b..058c000 100644
--- a/check_config/config.json
+++ b/check_config/config.json
@@ -1,11 +1,12 @@
 {
   "name": "Check Home Assistant configuration",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "slug": "check_config",
   "description": "Check current Home Assistant configuration against a new version",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/check_config",
   "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
-  "udev": true,
+  "uart": true,
+  "usb": true,
   "startup": "once",
   "boot": "manual",
   "init": false,
diff --git a/check_config/rootfs/etc/services.d/check-config/finish b/check_config/rootfs/etc/services.d/check-config/finish
index 4e3864c..a1ecd5f 100644
--- a/check_config/rootfs/etc/services.d/check-config/finish
+++ b/check_config/rootfs/etc/services.d/check-config/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb -S0
+#!/usr/bin/execlineb -S1
 # ==============================================================================
 # Take down the S6 supervision tree when config check is done
 # ==============================================================================
diff --git a/check_config/rootfs/etc/services.d/check-config/run b/check_config/rootfs/etc/services.d/check-config/run
index c2a8539..165fe28 100644
--- a/check_config/rootfs/etc/services.d/check-config/run
+++ b/check_config/rootfs/etc/services.d/check-config/run
@@ -4,10 +4,6 @@
 # ==============================================================================
 VERSION=$(bashio::config 'version')
 
-# Create udev devices
-bashio::log.info "Setup udev devices"
-bashio::hardware.trigger
-
 # Generate install string
 CMD="homeassistant"
 if [ "${VERSION}" != "latest" ]; then
@@ -19,7 +15,7 @@ bashio::log.info "Installing Home Assistant: ${VERSION}..."
 bashio::log.info "Please be patient, this might take a few minutes..."
 
 # Install Home Assistant with the requested version
-if ! PIP_OUTPUT="$(pip3 install --disable-pip-version-check --find-links "${WHEELS_LINKS}" "${CMD}")"; then
+if ! PIP_OUTPUT="$(pip3 install --disable-pip-version-check --find-links "${WHEELS_LINKS}" "${CMD}" 2>&1)"; then
     bashio::log.error "An error occurred while installing Home Assistant:"
     bashio::log "${PIP_OUTPUT}"
     bashio::exit.nok