summaryrefslogtreecommitdiffstats
path: root/src/core/macros.systemd.in
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-07-03 15:36:15 +0200
committerGitHub <noreply@github.com>2018-07-03 15:36:15 +0200
commit1235a7dc73e48acbcb76eee0f42b8281b8554658 (patch)
treeb9a056f67618749e82056090c30e956956f577d1 /src/core/macros.systemd.in
parentconf-parser,login: logs description of error in parsing size (diff)
parentrpm: Add misspelled %_environmentdir macro for temporary compatibility (diff)
downloadsystemd-1235a7dc73e48acbcb76eee0f42b8281b8554658.tar.xz
systemd-1235a7dc73e48acbcb76eee0f42b8281b8554658.zip
Merge pull request #9417 from Conan-Kudo/rpm-environmentdir-typo
rpm: Fix typo in %_environmentdir
Diffstat (limited to '')
-rw-r--r--src/core/macros.systemd.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
index f3b74f4273..abbb42b22f 100644
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@ -18,7 +18,7 @@
%_sysctldir @sysctldir@
%_sysusersdir @sysusersdir@
%_tmpfilesdir @tmpfilesdir@
-%_environmnentdir @environmentdir@
+%_environmentdir @environmentdir@
%_modulesloaddir @modulesloaddir@
%_modprobedir @modprobedir@
%_systemdgeneratordir @systemgeneratordir@
@@ -26,6 +26,10 @@
%_systemd_system_env_generator_dir @systemenvgeneratordir@
%_systemd_user_env_generator_dir @userenvgeneratordir@
+# Because we had one release with a typo...
+# This is temporary (Remove after systemd 240 is released)
+%_environmnentdir %_environmentdir
+
%systemd_requires \
Requires(post): systemd \
Requires(preun): systemd \