Compare commits

..

No commits in common. "c8s" and "c9s-plans-location-update" have entirely different histories.

4 changed files with 88 additions and 19 deletions

View File

@ -6,7 +6,3 @@ if [ -f ~/.bashrc ]; then
fi
# User specific environment and startup programs
PATH=$PATH:$HOME/bin
export PATH

View File

@ -1,12 +1,22 @@
# .bashrc
# User specific aliases and functions
alias rm='rm -i'
alias cp='cp -i'
alias mv='mv -i'
# Source global definitions
if [ -f /etc/bashrc ]; then
. /etc/bashrc
fi
# User specific environment
if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]
then
PATH="$HOME/.local/bin:$HOME/bin:$PATH"
fi
export PATH
# Uncomment the following line if you don't like systemctl's auto-paging feature:
# export SYSTEMD_PAGER=
# User specific aliases and functions
alias rm='rm -i'
alias cp='cp -i'
alias mv='mv -i'

6
rootfiles.conf Normal file
View File

@ -0,0 +1,6 @@
# create initial /root directories shell content
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,9 +1,8 @@
Summary: The basic required files for the root user's directory
Name: rootfiles
Version: 8.1
Release: 22%{?dist}
Release: 35%{?dist}
License: Public Domain
Group: System Environment/Base
# This is a Red Hat maintained package which is specific to
# our distribution. Thus the source is only available from
@ -13,8 +12,12 @@ Source1: dot-bash_profile
Source2: dot-bash_logout
Source3: dot-tcshrc
Source4: dot-cshrc
Source5: rootfiles.conf
%define ROOTFILES_DIR %{_datadir}/rootfiles
BuildArch: noarch
BuildRequires: systemd-rpm-macros
%description
The rootfiles package contains basic required files that are placed
@ -25,24 +28,78 @@ users' home directories.
%prep
%install
mkdir -p $RPM_BUILD_ROOT/root
mkdir -p $RPM_BUILD_ROOT/%{ROOTFILES_DIR}
install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_tmpfilesdir}/rootfiles.conf
for file in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} ; do
f=`basename $file`
install -p -m 644 $file $RPM_BUILD_ROOT/root/${f/dot-/.}
install -p -m 644 $file $RPM_BUILD_ROOT/%{ROOTFILES_DIR}/${f/dot-/.}
done
%posttrans
if [ $1 -eq 0 ] ; then
#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/. /root/ || :
fi
# 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
%defattr(-,root,root,-)
%config(noreplace) /root/.[A-Za-z]*
%dir %{ROOTFILES_DIR}
%{ROOTFILES_DIR}/.[A-Za-z]*
%{_tmpfilesdir}/rootfiles.conf
%ghost %verify(not md5 size mtime) %attr(0644,root,root) /root/.bash_logout
%ghost %verify(not md5 size mtime) %attr(0644,root,root) /root/.bash_profile
%ghost %verify(not md5 size mtime) %attr(0644,root,root) /root/.bashrc
%ghost %verify(not md5 size mtime) %attr(0644,root,root) /root/.cshrc
%ghost %verify(not md5 size mtime) %attr(0644,root,root) /root/.tcshrc
%changelog
* Wed May 21 2025 Martin Osvald <mosvald@redhat.com> - 8.1-35
- Fix file permissions and do not verify digest, file size
and modification time (RHEL-92548)
* Wed Feb 12 2025 Martin Osvald <mosvald@redhat.com> - 8.1-34
- Comment out empty if clause to prevent shell error (RHEL-58760)
* 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)
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 8.1-31
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 8.1-30
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.1-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.1-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.1-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Nov 11 2019 Till Maas <opensource@till.name> - 8.1-26
- Sync in current files from bash package:
https://src.fedoraproject.org/rpms/bash/c/739b272e5f5d10cf27a847a44d09eb7f4b6ec89b?branch=master
https://src.fedoraproject.org/rpms/bash/c/329df36f8bbc303be618f06562ec2c4eebfd1d29?branch=master
https://src.fedoraproject.org/rpms/bash/c/e3b3cd9cec4a3bd12a792536c0ea131f5ba5bd72?branch=master
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.1-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.1-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.1-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.1-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild