package/samba: use FHS dirs

Clean up system directories by making samba conform to FHS and by using
subdirectories e.g. /var/log/samba and /var/run/samba instead of
/var/log and /var/run.

Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/samba/S91smb b/package/samba/S91smb
index c190771b7de280cdf5c8b26c61d9d6f5b33ffd9e..2e03e829ca5ad7ddef89aeef8e97b08bb473223f 100755 (executable)
--- a/package/samba/S91smb
+++ b/package/samba/S91smb
@@ -10,6 +10,7 @@
 mkdir -p /var/cache/samba
 mkdir -p /var/log/samba
 mkdir -p /var/lock/subsys
+mkdir -p /var/run/samba
 
 RETVAL=0
 
@@ -33,13 +34,13 @@ stop() {
        echo -n "Shutting down SMB services: "
        kill -9 `pidof smbd`
        RETVAL=$?
-       rm -f /var/run/smbd.pid
+       rm -f /var/run/samba/smbd.pid
        echo "done"
 
        echo -n "Shutting down NMB services: "
        kill -9 `pidof nmbd`
        RETVAL2=$?
-       rm -f /var/run/nmbd.pid
+       rm -f /var/run/samba/nmbd.pid
 
        [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb
        echo "done"

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 064bfd1c23bffa4002678ba275964be367808586..f4f07acb6bc9b20ea0170caf495e230ef1b3d72d 100644 (file)
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -33,11 +33,11 @@ SAMBA_CONF_ENV = \
        $(if $(BR2_PACKAGE_SAMBA_AVAHI),AVAHI_LIBS=-pthread)
 
 SAMBA_CONF_OPTS = \
-       --with-piddir=/var/run \
-       --with-lockdir=/var/lock \
-       --with-logfilebase=/var/log \
-       --with-configdir=/etc/samba \
-       --with-privatedir=/etc/samba \
+       --with-fhs \
+       --with-piddir=/var/run/samba \
+       --with-lockdir=/var/cache/samba \
+       --with-ncalrpcdir=/var/run/ncalrpc \
+       --with-nmbdsocketdir=/var/run/nmbd \
        \
        --disable-cups \
        --enable-shared-libs \