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

- tmpfiles-suse.conf: drop entries for /run/lock and /var/log/wtmp

Browse Source 
/run/lock is now defined by filesystem package and wtmp has been replaced by
  wtmpdb on TW.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1460
This commit is contained in:
Franck Bui 2023-10-13 09:36:13 +00:00 committed by Git OBS Bridge
parent cd6da999b0
commit b4278439c5
4 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files.systemd
View File

@ -463,8 +463,8 @@
%{_tmpfilesdir}/credstore.conf
%{_tmpfilesdir}/journal-nocow.conf
%{_tmpfilesdir}/provision.conf
%{_tmpfilesdir}/suse.conf
%{_tmpfilesdir}/systemd-nologin.conf
%{_tmpfilesdir}/systemd-suse.conf
%{_tmpfilesdir}/systemd-tmp.conf
%{_tmpfilesdir}/systemd.conf
%{_tmpfilesdir}/x11.conf

8
systemd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Oct 13 09:28:23 UTC 2023 - Franck Bui <fbui@suse.com>
- tmpfiles-suse.conf: drop entries for /run/lock and /var/log/wtmp
/run/lock is now defined by filesystem package and wtmp has been replaced by
wtmpdb on TW.
-------------------------------------------------------------------
Thu Oct 5 15:04:50 UTC 2023 - Franck Bui <fbui@suse.com>

24
systemd.spec
View File

@ -942,26 +942,12 @@ rm -f %{buildroot}%{_presetdir}/*.preset
echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset
echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset
# The current situation with tmpfiles snippets dealing with the generic paths is
# pretty messy currently because:
#
# 1. filesystem package wants to define the generic paths and some of them
# conflict with the definition given by systemd in var.conf, see
# bsc#1078466.
#
# 2. /tmp and /var/tmp are not cleaned by default on SUSE distros (fate#314974)
# which conflict with tmp.conf.
#
# 3. There're also legacy.conf which defines various legacy paths which either
# don't match the SUSE defaults or don't look needed at all.
#
# 4. We don't want the part in etc.conf which imports default upstream files in
# empty /etc, see below.
#
# To keep things simple, we remove all these tmpfiles config files but still
# keep the remaining paths that still don't have a better home in suse.conf.
# Most of the entries for the generic paths are defined by filesystem package as
# the definitions used by SUSE distros diverged from the ones defined by
# systemd. For lack of a better place some (deprecated) paths are still shipped
# along with the systemd package.
rm -f %{buildroot}%{_tmpfilesdir}/{etc,home,legacy,tmp,var}.conf
install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/suse.conf
install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/systemd-suse.conf
# The content of the files shipped by systemd doesn't match the
# defaults used by SUSE. Don't ship those files but leave the decision

6
tmpfiles-suse.conf
View File

@ -5,9 +5,3 @@
# Legacy symlink. Maybe should be owned by util-linux ?
L+ /etc/mtab - - - - ../proc/self/mounts
# FIXME: move to filesystem ?
d /run/lock 0775 root root -
# FIXME: Move to shadow ?
f /var/log/wtmp 0664 root utmp -