⬆️ Upgrades add-on base image to 6.0.0 (#231)

nut/Dockerfile

@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.3.0
+ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:6.0.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 

nut/build.yaml

@@ -1,10 +1,10 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.3.0
-  amd64: ghcr.io/hassio-addons/debian-base/amd64:5.3.0
-  armhf: ghcr.io/hassio-addons/debian-base/armhf:5.3.0
-  armv7: ghcr.io/hassio-addons/debian-base/armv7:5.3.0
-  i386: ghcr.io/hassio-addons/debian-base/i386:5.3.0
+  aarch64: ghcr.io/hassio-addons/debian-base/aarch64:6.0.0
+  amd64: ghcr.io/hassio-addons/debian-base/amd64:6.0.0
+  armhf: ghcr.io/hassio-addons/debian-base/armhf:6.0.0
+  armv7: ghcr.io/hassio-addons/debian-base/armv7:6.0.0
+  i386: ghcr.io/hassio-addons/debian-base/i386:6.0.0
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev

nut/config.yaml

@@ -12,6 +12,7 @@ arch:
   - armhf
   - armv7
   - i386
+init: false
 uart: true
 udev: true
 usb: true

nut/rootfs/etc/cont-init.d/nut.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Network UPS Tools
 # Configures Network UPS Tools
@@ -11,6 +11,13 @@ declare shutdowncmd
 declare upsmonpwd
 declare username
 
+chown root:root /var/run/nut
+chmod 0770 /var/run/nut
+
+chown -R root:root /etc/nut
+find /etc/nut -not -perm 0660 -type f -exec chmod 0660 {} \;
+find /etc/nut -not -perm 0660 -type d -exec chmod 0660 {} \;
+
 nutmode=$(bashio::config 'mode')
 bashio::log.info "Setting mode to ${nutmode}..."
 sed -i "s#%%nutmode%%#${nutmode}#g" /etc/nut/nut.conf

nut/rootfs/etc/cont-init.d/nutclient.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Network UPS Tools
 # Configures Network UPS Tools for Client Mode only

nut/rootfs/etc/services.d/upsd/finish

@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Network UPS Tools
 # Take down the S6 supervision tree when upsd fails
 # ==============================================================================
-if -n { s6-test $# -ne 0 }
-if -n { s6-test ${1} -eq 256 }
+if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
+  bashio::log.warning "upsd crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
 
-s6-svscanctl -t /var/run/s6/services
+bashio::log.info "upsd stopped, restarting..."

nut/rootfs/etc/services.d/upsd/run

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Network UPS Tools
 # Run upsd

nut/rootfs/etc/services.d/upsmon/finish

@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Network UPS Tools
-# Take down the S6 supervision tree when upsd fails
+# Take down the S6 supervision tree when upsmon fails
 # ==============================================================================
-if -n { s6-test $# -ne 0 }
-if -n { s6-test ${1} -eq 256 }
+if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
+  bashio::log.warning "upsmon crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
 
-s6-svscanctl -t /var/run/s6/services
+bashio::log.info "upsmon stopped, restarting..."

nut/rootfs/etc/services.d/upsmon/run

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Network UPS Tools
 # Run upsmon

nut/rootfs/usr/bin/shutdownhost

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Network UPS Tools
 # Script to shutdown the host from UPS Shutdown Command