Unverified Commit 3ab5c251 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Use PID for Samba process (#1454)

parent 17db1ac3

src/power.sh

+9 −1
Original line number Diff line number Diff line
@@ -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

+13 −11
Original line number Diff line number Diff line
@@ -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"

      if ! ip link set "$interfaces" multicast on >/dev/null; then

        warn "Failed to enable multicast on loopback interface!"

      fi ;;

    *)

      interfaces="dockerbridge"

      interfaces="lo" ;;

      # if ! ip link set "$interfaces" multicast on >/dev/null; then

      #  warn "Failed to enable multicast on loopback interface!"

      # fi ;;

    *) interfaces="dockerbridge" ;;

  esac

  if [ -n "${SAMBA_INTERFACE:-}" ]; then

    interfaces+=",$SAMBA_INTERFACE"

      fi ;;

  esac

  fi

fi



html "Initializing shared folder..."