Merge pull request #10910 from Andy2244/wsdd2-smbd-rename

wsdd2: update init for renamed cifsd->smbd
This commit is contained in:
Rosen Penev 2020-01-03 16:32:35 -08:00 committed by GitHub
commit dbdb19aa4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=wsdd2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/Andy2244/wsdd2.git

View file

@ -13,8 +13,8 @@ BI_PARM=""
start_service() {
if [ -e /etc/cifs/smb.conf ] && [ -e /etc/init.d/cifsd ] && /etc/init.d/cifsd running; then
SMB_CONF="/etc/cifs/smb.conf"
if [ -e /etc/smbd/smb.conf ] && [ -e /etc/init.d/smbd ] && /etc/init.d/smbd running; then
SMB_CONF="/etc/smbd/smb.conf"
fi
if [ -e /etc/samba/smb.conf ]; then
@ -26,7 +26,7 @@ start_service() {
fi
if [ -z "$SMB_CONF" ]; then
logger -p daemon.error -t 'wsdd2' "samba36/4 or cifsd is not running, can't start wsdd2!"
logger -p daemon.error -t 'wsdd2' "samba36/4 or smbd is not running, can't start wsdd2!"
exit 1
fi
@ -82,5 +82,5 @@ start_service() {
service_triggers() {
PROCD_RELOAD_DELAY=1000
procd_add_reload_trigger "dhcp" "system" "samba" "samba4" "cifsd"
procd_add_reload_trigger "dhcp" "system" "samba" "samba4" "smbd"
}