rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 1040361 from Base:System

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2022-12-06 13:22:42 +00:00 committed by Git OBS Bridge
commit 5e6ec439fd
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files.systemd
View File

@ -209,7 +209,6 @@
%{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_systemd-tmpfiles
%{_datadir}/zsh/site-functions/_timedatectl %{_datadir}/zsh/site-functions/_timedatectl
%endif %endif
%{_environmentdir}/99-environment.conf
%{_journalcatalogdir}/systemd.be.catalog %{_journalcatalogdir}/systemd.be.catalog
%{_journalcatalogdir}/systemd.be@latin.catalog %{_journalcatalogdir}/systemd.be@latin.catalog
%{_journalcatalogdir}/systemd.bg.catalog %{_journalcatalogdir}/systemd.bg.catalog

7
systemd.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Dec 2 14:06:08 UTC 2022 - Franck Bui <fbui@suse.com>
- 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 <fbui@suse.com> Fri Nov 25 16:37:18 UTC 2022 - Franck Bui <fbui@suse.com>

5
systemd.spec
View File

@ -823,6 +823,11 @@ ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf
# SUSE (bsc#1006978). # SUSE (bsc#1006978).
rm -f %{buildroot}%{_sysusersdir}/basic.conf 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 # Remove README file in init.d as (SUSE) rpm requires executable files in this
# directory... oh well. # directory... oh well.
rm -f %{buildroot}/etc/init.d/README rm -f %{buildroot}/etc/init.d/README