From 6b65722cc18ba797a85482108ec08e99bb7a8f1a839e6f7e0d738706cdce5cdf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 6 Dec 2022 13:22:42 +0000 Subject: [PATCH] Accepting request 1040361 from Base:System - Don't ship symlink /usr/lib/environment.d/99-environment.conf anymore. /etc/environment is owned and parsed (among other config files) by pam_env(8), which is included by 'systemd-user' PAM service anyway. OBS-URL: https://build.opensuse.org/request/show/1040361 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=373 --- files.systemd | 1 - systemd.changes | 7 +++++++ systemd.spec | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/files.systemd b/files.systemd index e4b0d920..36178f84 100644 --- a/files.systemd +++ b/files.systemd @@ -209,7 +209,6 @@ %{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_timedatectl %endif -%{_environmentdir}/99-environment.conf %{_journalcatalogdir}/systemd.be.catalog %{_journalcatalogdir}/systemd.be@latin.catalog %{_journalcatalogdir}/systemd.bg.catalog diff --git a/systemd.changes b/systemd.changes index 02b7de36..c29812f8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 2 14:06:08 UTC 2022 - Franck Bui + +- Don't ship symlink /usr/lib/environment.d/99-environment.conf + anymore. /etc/environment is owned and parsed (among other config files) by + pam_env(8), which is included by 'systemd-user' PAM service anyway. + ------------------------------------------------------------------- Fri Nov 25 16:37:18 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index a6fc152c..ca60b72b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -823,6 +823,11 @@ ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf # SUSE (bsc#1006978). rm -f %{buildroot}%{_sysusersdir}/basic.conf +# systemd-user PAM module relies on pam_env(8) to import the environment defined +# in /etc/environment (which is part of the environment configuration files of +# pam_env(8) anyways). +rm -f %{buildroot}%{_environmentdir}/99-environment.conf + # Remove README file in init.d as (SUSE) rpm requires executable files in this # directory... oh well. rm -f %{buildroot}/etc/init.d/README