Fix tmpfiles rules

... and accept that there's no easy way to support copying additional
files from /etc/skel .

Related: RHEL-58760
This commit is contained in:
David Tardon 2025-01-30 09:37:30 +01:00
parent f9688bab05
commit 52bb578589
2 changed files with 13 additions and 3 deletions

View File

@ -1,2 +1,6 @@
# create initial /root directories shell content
C+ /root/ 644 root root - /usr/share/rootfiles/
C /root/.bash_logout 644 root root - /usr/share/rootfiles/.bash_logout
C /root/.bash_profile 644 root root - /usr/share/rootfiles/.bash_profile
C /root/.bashrc 644 root root - /usr/share/rootfiles/.bashrc
C /root/.cshrc 644 root root - /usr/share/rootfiles/.cshrc
C /root/.tcshrc 644 root root - /usr/share/rootfiles/.tcshrc

View File

@ -1,7 +1,7 @@
Summary: The basic required files for the root user's directory
Name: rootfiles
Version: 8.1
Release: 32%{?dist}
Release: 33%{?dist}
License: Public Domain
# This is a Red Hat maintained package which is specific to
@ -39,7 +39,10 @@ done
%posttrans
if [ $1 -eq 0 ] ; then
#copy recursively the content, but do not overwrite the original files provided by rootfiles package
cp -ndr --preserve=ownership,timestamps /etc/skel/. %{ROOTFILES_DIR}/ || :
# NOTE: This has been broken by the conversion to tmpfiles. I see only one way to make it
# work: to synthetize a tmpfiles entry for each of these additional files/dirs. That seems like
# a lot of effort to continue supporting a feature for which there's likely not a high demand...
# cp -ndr --preserve=ownership,timestamps /etc/skel/. %{ROOTFILES_DIR}/ || :
fi
%files
@ -53,6 +56,9 @@ fi
%ghost /root/.tcshrc
%changelog
* Thu Jan 30 2025 David Tardon <dtardon@redhat.com> - 8.1-33
- Fix tmpfiles rules (RHEL-58760)
* Tue Jan 28 2025 David Tardon <dtardon@redhat.com> - 8.1-32
- Use tmpfiles.d to create initial /root directory (RHEL-58760)