From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 19 Jun 2019 09:14:42 +0000 (+0100)
Subject: systemd: Conflict setup < 3.0-13 for /etc/environment
X-Git-Url: http://git.ipfire.org/?p=people%2Fstevee%2Fipfire-3.x.git;a=commitdiff_plain;h=dc322253843316f17bef9a3f4f80eadb1833b5bc

systemd: Conflict setup < 3.0-13 for /etc/environment

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

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 270a3f78e..a1c3677d0 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 242
-release    = 1
+release    = 2
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -263,6 +263,7 @@ packages
 			dracut < 019
 			filesystem < 002
 			rsyslog < 5.8.6-4
+			setup < 3.0-13
 			upstart
 		end