From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 19 Jun 2019 09:14:33 +0000 (+0100)
Subject: setup: Drop /etc/environment
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=515b7d8646c1ad5ef2807a4c4e08453cd82665fc;p=ipfire-3.x.git

setup: Drop /etc/environment

This is going to be shipped by systemd

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/setup/setup.nm b/setup/setup.nm
index 0bb936ccb..be0ca4ba0 100644
--- a/setup/setup.nm
+++ b/setup/setup.nm
@@ -5,7 +5,7 @@
 
 name       = setup
 version    = 3.0
-release    = 12
+release    = 13
 arch       = noarch
 
 groups     = Base Build System/Base
@@ -45,7 +45,7 @@ build
 			cp -vf %{DIR_APP}/${i} %{BUILDROOT}/etc || exit 1; \
 		done
 
-		touch %{BUILDROOT}%{sysconfdir}/{environment,fstab}
+		touch %{BUILDROOT}%{sysconfdir}/fstab
 		chmod -v 0400 %{BUILDROOT}%{sysconfdir}/{,g}shadow
 
 		mkdir -pv %{BUILDROOT}%{sysconfdir}/sysctl.d