diff mbox

package/samba4: Change tmpfiles path

Message ID 1467476491-6900-1-git-send-email-maxime.hadjinlian@gmail.com
State Accepted
Headers show

Commit Message

Maxime Hadjinlian July 2, 2016, 4:21 p.m. UTC
Per the documentation:
https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html

The order of path by priorites is:
/etc/tmpfiles.d/*.conf
/run/tmpfiles.d/*.conf
/usr/lib/tmpfiles.d/*.conf

For the user to be able to override our tmpfiles easily, it's better to
place our files in /usr/lib/tmpfiles.d/

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/samba4/samba4.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni July 2, 2016, 4:50 p.m. UTC | #1
Hello,

On Sat,  2 Jul 2016 18:21:31 +0200, Maxime Hadjinlian wrote:
> Per the documentation:
> https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html
> 
> The order of path by priorites is:
> /etc/tmpfiles.d/*.conf
> /run/tmpfiles.d/*.conf
> /usr/lib/tmpfiles.d/*.conf
> 
> For the user to be able to override our tmpfiles easily, it's better to
> place our files in /usr/lib/tmpfiles.d/
> 
> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
>  package/samba4/samba4.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
diff mbox

Patch

diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk
index 9f2bb0d..9ac72f5 100644
--- a/package/samba4/samba4.mk
+++ b/package/samba4/samba4.mk
@@ -156,8 +156,8 @@  define SAMBA4_INSTALL_INIT_SYSTEMD
 	ln -sf ../../../../usr/lib/systemd/system/winbind.service \
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/winbind.service
 	$(INSTALL) -D -m 644 $(@D)/packaging/systemd/samba.conf.tmp \
-		$(TARGET_DIR)/etc/tmpfiles.d/samba.conf
-	printf "d /var/log/samba  755 root root\n" >>$(TARGET_DIR)/etc/tmpfiles.d/samba.conf
+		$(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf
+	printf "d /var/log/samba  755 root root\n" >>$(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf
 endef
 
 $(eval $(generic-package))