summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2022-11-28 01:46:19 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2022-11-28 08:27:11 +0100
commitdc02c77e1dd2e5194c3912b8dc41f6c4b3f5f2c7 (patch)
tree7269d2de7bef47ebe8e0893c4ab1aa94d4e23552
parent67ca3f26f710c58a1196f1ff11eef639e9d4fa27 (diff)
package: samba: Avoid creating sockets in /etc/
Otherwise cfgfs will complain. Signed-off-by: Phil Sutter <phil@nwl.cc>
-rw-r--r--package/samba/Makefile4
-rw-r--r--package/samba/files/samba.init5
2 files changed, 5 insertions, 4 deletions
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 2a04e10c6..cd6944476 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= samba
PKG_VERSION:= 4.13.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_HASH:= 276464396a05d88b775bda01ac2eb1e5a636ccf7010b0fd28efc3d85583af2b4
PKG_DESCR:= file and print server
PKG_SECTION:= net/fs
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --enable-fhs \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
- --with-privatedir=/etc/samba \
+ --with-privatedir=/var/lib/samba \
--cross-compile \
--cross-answers=$(WRKSRC)/cache.txt \
--hostcc=gcc \
diff --git a/package/samba/files/samba.init b/package/samba/files/samba.init
index 21b983530..8b9e7e375 100644
--- a/package/samba/files/samba.init
+++ b/package/samba/files/samba.init
@@ -11,12 +11,13 @@ autostart)
exec sh $0 start
;;
start)
- [ -d /var/lib/samba ] || mkdir -p /var/lib/samba
+ [ -d /var/lib/samba/msg.sock ] || mkdir -p /var/lib/samba/msg.sock
[ -d /var/run/samba ] || mkdir -p /var/run/samba
[ -d /var/log/samba ] || mkdir -p /var/log/samba
[ -d /var/cache/samba ] || mkdir -p /var/cache/samba
[ -d /var/lock/samba ] || mkdir -p /var/lock/samba
- /usr/sbin/nmbd -D
+ chmod 700 /var/lib/samba/msg.sock
+ /usr/sbin/nmbd -D
/usr/sbin/smbd -D
;;
stop)