samba: Migrate add-on layout to S6 Overlay (#3001)

Co-authored-by: Franck Nijhof <[email protected]>

samba/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 11.1.0
+
+- Migrate add-on layout to S6 Overlay
+
 ## 11.0.0
 
 - The `config` share has been renamed to `homeassistant` to match upstream changes.

samba/rootfs/etc/cont-init.d/samba.sh → samba/rootfs/etc/s6-overlay/s6-rc.d/init-smbd/run

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Prepare the Samba service for running
 # ==============================================================================

samba/rootfs/etc/s6-overlay/s6-rc.d/init-smbd/type

@@ -0,0 +1 @@
+oneshot

samba/rootfs/etc/s6-overlay/s6-rc.d/init-smbd/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-smbd/run

samba/rootfs/etc/s6-overlay/s6-rc.d/nmbd/finish

@@ -0,0 +1,25 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Take down the S6 supervision tree when nmbd fails
+# ==============================================================================
+readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
+readonly exit_code_service="${1}"
+readonly exit_code_signal="${2}"
+readonly service="nmbd"
+
+bashio::log.info \
+  "Service ${service} exited with code ${exit_code_service}" \
+  "(by signal ${exit_code_signal})"
+
+if [[ "${exit_code_service}" -eq 256 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
+  fi
+  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
+elif [[ "${exit_code_service}" -ne 0 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
+  fi
+  exec /run/s6/basedir/bin/halt
+fi

samba/rootfs/etc/services.d/nmbd/run → samba/rootfs/etc/s6-overlay/s6-rc.d/nmbd/run

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/command/with-contenv bashio
 # ==============================================================================
 # Start nmbd service
 # ==============================================================================

samba/rootfs/etc/s6-overlay/s6-rc.d/nmbd/type

@@ -0,0 +1 @@
+longrun

samba/rootfs/etc/s6-overlay/s6-rc.d/smbd/finish

@@ -0,0 +1,25 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Take down the S6 supervision tree when smbd fails
+# ==============================================================================
+readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
+readonly exit_code_service="${1}"
+readonly exit_code_signal="${2}"
+readonly service="smbd"
+
+bashio::log.info \
+  "Service ${service} exited with code ${exit_code_service}" \
+  "(by signal ${exit_code_signal})"
+
+if [[ "${exit_code_service}" -eq 256 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
+  fi
+  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
+elif [[ "${exit_code_service}" -ne 0 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
+  fi
+  exec /run/s6/basedir/bin/halt
+fi

samba/rootfs/etc/services.d/smbd/run → samba/rootfs/etc/s6-overlay/s6-rc.d/smbd/run

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/command/with-contenv bashio
 # ==============================================================================
 # Start smbd service
 # ==============================================================================

samba/rootfs/etc/s6-overlay/s6-rc.d/smbd/type

@@ -0,0 +1 @@
+longrun