From 7105393e4cefc636b5bccef1742d66ede580df99 Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Mon, 19 Jan 2015 18:14:11 +0200 Subject: [PATCH] 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 Reviewed-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/samba/S91smb | 5 +++-- package/samba/samba.mk | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/samba/S91smb b/package/samba/S91smb index c190771b7d..2e03e829ca 100755 --- 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 064bfd1c23..f4f07acb6b 100644 --- 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 \