From ff231a14de30cf202aa97606b89fc4372d8f2220 Mon Sep 17 00:00:00 2001 From: Martin Osvald Date: Wed, 12 Feb 2025 14:49:07 +0100 Subject: [PATCH] Comment out empty if clause to prevent shell error Resolves: RHEL-58760 --- rootfiles.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rootfiles.spec b/rootfiles.spec index 499b7f7..fd1b973 100644 --- a/rootfiles.spec +++ b/rootfiles.spec @@ -1,7 +1,7 @@ Summary: The basic required files for the root user's directory Name: rootfiles Version: 8.1 -Release: 33%{?dist} +Release: 34%{?dist} License: Public Domain # This is a Red Hat maintained package which is specific to @@ -37,13 +37,13 @@ for file in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} ; do 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 # 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 +#fi %files %dir %{ROOTFILES_DIR} @@ -56,6 +56,9 @@ fi %ghost /root/.tcshrc %changelog +* Wed Feb 12 2025 Martin Osvald - 8.1-34 +- Comment out empty if clause to prevent shell error (RHEL-58760) + * Thu Jan 30 2025 David Tardon - 8.1-33 - Fix tmpfiles rules (RHEL-58760)