cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

wsdd2: update to git (2019-12-15), bind to 'lan' only

Browse Source 
* update to git (2019-12-15)
* bind to 'lan' interface only
* make cifsd compatible (avoid testparm dependency)
* only start if needed
* add meta data (vendor, model, sku)
* update smb.conf procd location
* lower restart delay
* remove outdated patch

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
This commit is contained in:
Andy Walsh
2019-12-15 17:11:25 +01:00
parent cfd690ca17
commit e1a305a355
3 changed files with 78 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/wsdd2/files/wsdd2.init
+74 -5
View File
@@ -3,15 +3,84 @@
START=99
USE_PROCD=1
SMB_CONF=""
BIND_IF_PARM=""
NB_PARM=""
WG_PARM=""
BI_PARM=""
. /lib/functions/network.sh
start_service() {
procd_open_instance
procd_set_param command /usr/bin/wsdd2 -w
if [ -e /etc/cifs/smb.conf ] && [ -e /etc/init.d/cifsd ] && /etc/init.d/cifsd running; then
SMB_CONF="/etc/cifs/smb.conf"
fi
if [ -e /etc/samba/smb.conf ]; then
if [ -e /etc/init.d/samba4 ] && /etc/init.d/samba4 running; then
SMB_CONF="/etc/samba/smb.conf"
elif [ -e /etc/init.d/samba ] && /etc/init.d/samba running; then
SMB_CONF="/etc/samba/smb.conf"
fi
fi
if [ -z "$SMB_CONF" ]; then
logger -p daemon.error -t 'wsdd2' "samba36/4 or cifsd is not running, can't start wsdd2!"
exit 1
fi
local nb_name
nb_name="$(grep -i 'netbios name' $SMB_CONF | awk -F'=' '{print $2}' | tr -d ' \n')"
if [ -n "$nb_name" ]; then
NB_PARM="-N $nb_name"
else
local hostname
hostname="$(cat /proc/sys/kernel/hostname)"
NB_PARM="-N $hostname"
fi
local wg_name
wg_name="$(grep -i 'workgroup' $SMB_CONF | awk -F'=' '{print $2}' | tr -d ' \n')"
if [ -n "$wg_name" ]; then
WG_PARM="-G $wg_name"
else
NB_PARM="-G WORKGROUP"
fi
# resolve lan interface (BUG: No multi-interface binds atm)
local ifname
if network_get_device ifname lan; then
BIND_IF_PARM="-i $ifname"
fi
local board_vendor
local board_model
local board_sku
if [ -e /tmp/sysinfo/board_name ]; then
board_vendor="$(cat /tmp/sysinfo/board_name | awk -F',' '{print $1}' | tr ' ' '_' | tr -d ' \n')"
board_sku="$(cat /tmp/sysinfo/board_name | awk -F',' '{print $2}' | tr ' ' '_' | tr -d ' \n')"
fi
if [ -e /tmp/sysinfo/model ]; then
board_model="$(cat /tmp/sysinfo/model | tr ' ' '_' | tr -d ' \n')"
fi
if [ -n "$board_vendor" ] && [ -n "$board_model" ]; then
if [ -n "$board_sku" ]; then
BI_PARM="-b vendor:$board_vendor,model:$board_model,sku:$board_sku"
else
BI_PARM="-b vendor:$board_vendor,model:$board_model"
fi
fi
procd_open_instance
procd_set_param command /usr/bin/wsdd2 -w $BIND_IF_PARM $NB_PARM $WG_PARM $BI_PARM
procd_set_param respawn
procd_set_param file /var/etc/smb.conf
procd_set_param file $SMB_CONF
procd_close_instance
}
service_triggers() {
PROCD_RELOAD_DELAY=3000
procd_add_reload_trigger "dhcp" "system" "samba4"
PROCD_RELOAD_DELAY=1000
procd_add_reload_trigger "dhcp" "system" "samba" "samba4" "cifsd"
}