- 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. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1460
This commit is contained in:
parent
fe43e79acb
commit
62c4b47aa4
@ -463,8 +463,8 @@
|
|||||||
%{_tmpfilesdir}/credstore.conf
|
%{_tmpfilesdir}/credstore.conf
|
||||||
%{_tmpfilesdir}/journal-nocow.conf
|
%{_tmpfilesdir}/journal-nocow.conf
|
||||||
%{_tmpfilesdir}/provision.conf
|
%{_tmpfilesdir}/provision.conf
|
||||||
%{_tmpfilesdir}/suse.conf
|
|
||||||
%{_tmpfilesdir}/systemd-nologin.conf
|
%{_tmpfilesdir}/systemd-nologin.conf
|
||||||
|
%{_tmpfilesdir}/systemd-suse.conf
|
||||||
%{_tmpfilesdir}/systemd-tmp.conf
|
%{_tmpfilesdir}/systemd-tmp.conf
|
||||||
%{_tmpfilesdir}/systemd.conf
|
%{_tmpfilesdir}/systemd.conf
|
||||||
%{_tmpfilesdir}/x11.conf
|
%{_tmpfilesdir}/x11.conf
|
||||||
|
@ -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>
|
Thu Oct 5 15:04:50 UTC 2023 - Franck Bui <fbui@suse.com>
|
||||||
|
|
||||||
|
24
systemd.spec
24
systemd.spec
@ -942,26 +942,12 @@ rm -f %{buildroot}%{_presetdir}/*.preset
|
|||||||
echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset
|
echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset
|
||||||
echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset
|
echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset
|
||||||
|
|
||||||
# The current situation with tmpfiles snippets dealing with the generic paths is
|
# Most of the entries for the generic paths are defined by filesystem package as
|
||||||
# pretty messy currently because:
|
# 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
|
||||||
# 1. filesystem package wants to define the generic paths and some of them
|
# along with the systemd package.
|
||||||
# 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.
|
|
||||||
rm -f %{buildroot}%{_tmpfilesdir}/{etc,home,legacy,tmp,var}.conf
|
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
|
# 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
|
# defaults used by SUSE. Don't ship those files but leave the decision
|
||||||
|
@ -5,9 +5,3 @@
|
|||||||
|
|
||||||
# Legacy symlink. Maybe should be owned by util-linux ?
|
# Legacy symlink. Maybe should be owned by util-linux ?
|
||||||
L+ /etc/mtab - - - - ../proc/self/mounts
|
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 -
|
|
||||||
|
Loading…
Reference in New Issue
Block a user