random-mirrors/dockur-windows
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2026-08-03 12:37:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove deprecated Samba socket address (#1857)

Browse Source
This commit is contained in:
Kroese
2026-07-15 17:03:33 +02:00
committed by GitHub
parent 9421d31b91
commit 50d5f4fc09
1 changed files with 93 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/samba.sh
+93 -78
View File
@@ -3,15 +3,16 @@ set -Eeuo pipefail
: "${SAMBA:="Y"}" # Enable Samba : "${SAMBA:="Y"}" # Enable Samba
: "${SAMBA_DEBUG:="N"}" # Disable debug : "${SAMBA_DEBUG:="N"}" # Disable debug
: "${SAMBA_CONFIG:="/etc/samba/smb.conf"}"
tmp="/tmp/smb"
rm -rf "$tmp"
DDN_PID="/var/run/wsdd.pid" DDN_PID="/var/run/wsdd.pid"
NMB_PID="/var/run/samba/nmbd.pid" NMB_PID="/var/run/samba/nmbd.pid"
SMB_PID="/var/run/samba/smbd.pid" SMB_PID="/var/run/samba/smbd.pid"
rm -f "$SMB_PID" "$NMB_PID" "$DDN_PID" if ! rm -f "$SMB_PID" "$NMB_PID" "$DDN_PID"; then
error "Failed to clean Samba PID files!"
return 0
fi
disabled "$SAMBA" && return 0 disabled "$SAMBA" && return 0
disabled "$NETWORK" && return 0 disabled "$NETWORK" && return 0
@@ -19,23 +20,23 @@ disabled "$NETWORK" && return 0
configureNetwork() { configureNetwork() {
if enabled "$DHCP"; then if enabled "$DHCP"; then
socket="$UPLINK"
hostname="$UPLINK" hostname="$UPLINK"
interfaces="$DEV" interfaces="$DEV"
return 0
fi
hostname="host.lan"
if isUserMode; then
interfaces="lo"
else else
hostname="host.lan" interfaces="$BRIDGE"
fi
if isUserMode; then if [ -n "${SAMBA_INTERFACE:-}" ]; then
interfaces="lo" interfaces+=",$SAMBA_INTERFACE"
socket="127.0.0.1"
else
socket="$IP"
interfaces="$BRIDGE"
fi
if [ -n "${SAMBA_INTERFACE:-}" ]; then
interfaces+=",$SAMBA_INTERFACE"
fi
fi fi
return 0 return 0
@@ -46,25 +47,29 @@ writeReadme() {
local dir="$1" local dir="$1"
local ref="$2" local ref="$2"
{ echo "--------------------------------------------------------" if ! {
echo " $APP for $ENGINE v$(</etc/version)..." echo "--------------------------------------------------------"
echo " For support visit $SUPPORT" echo " $APP for $ENGINE v$(</etc/version)..."
echo "--------------------------------------------------------" echo " For support visit $SUPPORT"
echo "" echo "--------------------------------------------------------"
echo "Using this folder you can exchange files with the host machine." echo ""
echo "" echo "Using this folder you can exchange files with the host machine."
echo "To select a folder on the host for this purpose, include the following bind mount in your compose file:" echo ""
echo "" echo "To select a folder on the host for this purpose, include the following bind mount in your compose file:"
echo " volumes:" echo ""
echo " - \"./example:${ref}\"" echo " volumes:"
echo "" echo " - \"./example:${ref}\""
echo "Or in your run command:" echo ""
echo "" echo "Or in your run command:"
echo " -v \"\${PWD:-.}/example:${ref}\"" echo ""
echo "" echo " -v \"\${PWD:-.}/example:${ref}\""
echo "Replace the example path ./example with your desired shared folder, which then will become visible here." echo ""
echo "" echo "Replace the example path ./example with your desired shared folder, which then will become visible here."
} | unix2dos > "$dir/readme.txt" echo ""
} | unix2dos > "$dir/readme.txt"; then
error "Failed to write shared folder readme!"
return 1
fi
return 0 return 0
} }
@@ -77,6 +82,7 @@ addShare() {
local comment="$4" local comment="$4"
local cfg="$5" local cfg="$5"
local owner="" local owner=""
local tmp="/tmp/smb"
if [ ! -d "$dir" ]; then if [ ! -d "$dir" ]; then
if ! mkdir -p "$dir"; then if ! mkdir -p "$dir"; then
@@ -85,13 +91,13 @@ addShare() {
fi fi
if ! ls -A "$dir" >/dev/null 2>&1; then if ! ls -A "$dir" >/dev/null 2>&1; then
msg="No permission to access shared folder ($dir)." local msg="No permission to access shared folder ($dir)."
msg+=" If SELinux is active, you need to add the \":Z\" flag to the bind mount." msg+=" If SELinux is active, you need to add the \":Z\" flag to the bind mount."
error "$msg" && return 1 error "$msg" && return 1
fi fi
if [ ! -w "$dir" ]; then if [ ! -w "$dir" ]; then
msg="shared folder ($dir) is not writeable!" local msg="shared folder ($dir) is not writeable!"
warn "$msg" warn "$msg"
fi fi
@@ -136,40 +142,50 @@ addShare() {
writeConfig() { writeConfig() {
{ echo "[global]" if ! {
echo " server string = Dockur" echo "[global]"
echo " netbios name = $hostname" echo " server string = Dockur"
echo " workgroup = WORKGROUP" echo " netbios name = $hostname"
echo " interfaces = $interfaces" echo " workgroup = WORKGROUP"
echo " bind interfaces only = yes" echo " interfaces = $interfaces"
echo " socket address = $socket" echo " bind interfaces only = yes"
echo " security = user" echo " security = user"
echo " guest account = nobody" echo " guest account = nobody"
echo " map to guest = Bad User" echo " map to guest = Bad User"
echo " server min protocol = NT1" echo " server min protocol = NT1"
echo " follow symlinks = yes" echo " follow symlinks = yes"
echo " wide links = yes" echo " wide links = yes"
echo " unix extensions = no" echo " unix extensions = no"
echo " inherit owner = yes" echo " inherit owner = yes"
echo " create mask = 0666" echo " create mask = 0666"
echo " directory mask = 02777" echo " directory mask = 02777"
echo " force user = root" echo " force user = root"
echo " force group = root" echo " force group = root"
echo " force create mode = 0666" echo " force create mode = 0666"
echo " force directory mode = 02777" echo " force directory mode = 02777"
echo "" echo ""
echo " # Disable printing services" echo " # Disable printing services"
echo " load printers = no" echo " load printers = no"
echo " printing = bsd" echo " printing = bsd"
echo " printcap name = /dev/null" echo " printcap name = /dev/null"
echo " disable spoolss = yes" echo " disable spoolss = yes"
} > "$SAMBA_CONFIG" } > "$SAMBA_CONFIG"; then
error "Failed to write Samba config \"$SAMBA_CONFIG\" !"
return 1
fi
return 0 return 0
} }
selectPrimaryShare() { selectPrimaryShare() {
local tmp="/tmp/smb"
if ! rm -rf "$tmp"; then
error "Failed to clean temporary Samba folder!"
return 1
fi
share="/shared" share="/shared"
[ ! -d "$share" ] && [ -d "$STORAGE/shared" ] && share="$STORAGE/shared" [ ! -d "$share" ] && [ -d "$STORAGE/shared" ] && share="$STORAGE/shared"
[ ! -d "$share" ] && [ -d "/data" ] && share="/data" [ ! -d "$share" ] && [ -d "/data" ] && share="/data"
@@ -227,7 +243,7 @@ startDaemon() {
local log="$2" local log="$2"
shift 2 shift 2
rm -f "$log" rm -f "$log" || :
if ! "$@"; then if ! "$@"; then
SAMBA_DEBUG="Y" SAMBA_DEBUG="Y"
@@ -269,30 +285,29 @@ startWsddn() {
return 0 return 0
} }
configureNetwork configureNetwork || return 0
html "Initializing shared folder..." html "Initializing shared folder..."
SAMBA_CONFIG="/etc/samba/smb.conf"
enabled "$DEBUG" && echo "Starting Samba daemon..." enabled "$DEBUG" && echo "Starting Samba daemon..."
writeConfig || return 1 writeConfig || return 0
# Add shared folders # Add shared folders
selectPrimaryShare selectPrimaryShare || return 0
! addShare "$share" "/shared" "Data" "Shared" "$SAMBA_CONFIG" && return 0
addOptionalShare "2" addShare "$share" "/shared" "Data" "Shared" "$SAMBA_CONFIG" || return 0
addOptionalShare "3" addOptionalShare "2" || :
addOptionalShare "3" || :
prepareSambaDirs || return 1 prepareSambaDirs || return 0
startSamba
startSamba || return 0
isUserMode && return 0 isUserMode && return 0
if [[ "${BOOT_MODE:-}" == "windows_legacy" ]]; then if [[ "${BOOT_MODE:-}" == "windows_legacy" ]]; then
startNetbios startNetbios || :
else else
startWsddn startWsddn || :
fi fi
return 0 return 0