From a8a8fc6638fa4a2a4a6810821fcc3d6c843d2861 Mon Sep 17 00:00:00 2001
From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon, 20 Mar 2023 18:47:48 +0100
Subject: [PATCH] filesystem: Make filesystem structure FHS compliant

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 filesystem/filesystem.nm | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/filesystem/filesystem.nm b/filesystem/filesystem.nm
index f94eedbac..f270b8616 100644
--- a/filesystem/filesystem.nm
+++ b/filesystem/filesystem.nm
@@ -5,7 +5,7 @@
 
 name       = filesystem
 version    = 002
-release    = 4
+release    = 5
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Base Build System/Base
@@ -44,10 +44,8 @@ build
 			opt \
 			proc \
 			root \
-			run/lock \
 			srv \
 			sys \
-			tmp \
 			usr/bin \
 			usr/include \
 			usr/lib \
@@ -60,11 +58,9 @@ build
 			usr/src \
 			var/empty \
 			var/lib \
-			var/local \
 			var/log \
-			var/nis \
-			var/preserve \
-			var/spool/{mail,lpd} \
+			var/mail \
+			var/spool \
 			var/tmp \
 			var/db \
 			var/cache
@@ -74,20 +70,12 @@ build
 		ln -snf usr/lib lib
 		[ "%{lib}" = "lib" ] || ln -snf usr/%{lib} %{lib}
 
-		ln -snf ../var/tmp usr/tmp
-		ln -snf spool/mail var/mail
-		ln -snf ../run var/run
-		ln -snf ../run/lock var/lock
-
 		# Setting correct permissions.
-		chmod 1777 %{BUILDROOT}/{,var/}tmp
-		chown root:mail %{BUILDROOT}/var/spool/mail
-		chmod 775 %{BUILDROOT}/var/spool/mail
+		chmod -v 755 %{BUILDROOT}/var/tmp
+		chown -v root:mail %{BUILDROOT}/var/mail
+		chmod -v 755 %{BUILDROOT}/var/mail
+		chmod -v 700 %{BUILDROOT}/root
 	end
-
-	# XXX not implemented at the moment
-	export QUALITY_AGENT_NO_DIRECTORY_CHECK = yes
-	export QUALITY_AGENT_NO_DIRECTORY_PRUNE = yes
 end
 
 packages
-- 
2.47.3