]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
setup: Drop /etc/environment
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Jun 2019 09:14:33 +0000 (10:14 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Jun 2019 09:14:33 +0000 (10:14 +0100)
This is going to be shipped by systemd

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

index 0bb936ccbaee95b0a21f4b1c4b99ca90eca62f0e..be0ca4ba08617f8e5a3ad4453450d69a1f85b552 100644 (file)
@@ -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