浏览代码

package: samba: Avoid creating sockets in /etc/

Otherwise cfgfs will complain.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Phil Sutter 1 年之前
父节点
当前提交
dc02c77e1d
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. 2 2
      package/samba/Makefile
  2. 3 2
      package/samba/files/samba.init

+ 2 - 2
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 \

+ 3 - 2
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)