feat: Use PID for Samba process (#1454)

src/power.sh

@@ -103,11 +103,19 @@ finish() {
 
   pid="/var/run/tpm.pid"
   [ -s "$pid" ] && pKill "$(<"$pid")"
+  rm -f "$pid"
 
   pid="/var/run/wsdd.pid"
   [ -s "$pid" ] && pKill "$(<"$pid")"
+  rm -f "$pid"
 
-  fKill "smbd"
+  pid="/var/run/samba/nmbd.pid"
+  [ -s "$pid" ] && pKill "$(<"$pid")"
+  rm -f "$pid"
+
+  pid="/var/run/samba/smbd.pid"
+  [ -s "$pid" ] && pKill "$(<"$pid")"
+  rm -f "$pid"
 
   closeNetwork
 

src/samba.sh

@@ -7,7 +7,10 @@ set -Eeuo pipefail
 
 tmp="/tmp/smb"
 rm -rf "$tmp"
-rm -rf /var/run/wsdd.pid
+
+rm -f /var/run/wsdd.pid
+rm -f /var/run/samba/nmbd.pid
+rm -f /var/run/samba/smbd.pid
 
 [[ "$SAMBA" == [Nn]* ]] && return 0
 [[ "$NETWORK" == [Nn]* ]] && return 0
@@ -19,16 +22,15 @@ else
   hostname="host.lan"
   case "${NETWORK,,}" in
     "user"* | "passt" | "slirp" )
-      interfaces="lo"
+      interfaces="lo" ;;
-      if ! ip link set "$interfaces" multicast on >/dev/null; then
+      # if ! ip link set "$interfaces" multicast on >/dev/null; then
-        warn "Failed to enable multicast on loopback interface!"
+      #  warn "Failed to enable multicast on loopback interface!"
-      fi ;;
+      # fi ;;
-    *)
+    *) interfaces="dockerbridge" ;;
-      interfaces="dockerbridge"
-      if [ -n "${SAMBA_INTERFACE:-}" ]; then
-        interfaces+=",$SAMBA_INTERFACE"
-      fi ;;
   esac
+  if [ -n "${SAMBA_INTERFACE:-}" ]; then
+    interfaces+=",$SAMBA_INTERFACE"
+  fi
 fi
 
 html "Initializing shared folder..."
@@ -37,7 +39,7 @@ html "Initializing shared folder..."
 addShare() {
   local dir="$1"
   local ref="$2"
-  local name="$3" 
+  local name="$3"
   local comment="$4"
 
   mkdir -p "$dir" || return 1