Merge #30 devel: Don't run hardlink if rpm-ostree is in use

This commit is contained in:
Laura Abbott 2019-10-30 20:34:01 +00:00
commit d40f98744c

View File

@ -2110,6 +2110,9 @@ popd
# #
# This macro defines a %%post script for a kernel*-devel package. # This macro defines a %%post script for a kernel*-devel package.
# %%kernel_devel_post [<subpackage>] # %%kernel_devel_post [<subpackage>]
# Note we don't run hardlink if ostree is in use, as ostree is
# a far more sophisticated hardlink implementation.
# https://github.com/projectatomic/rpm-ostree/commit/58a79056a889be8814aa51f507b2c7a4dccee526
# #
%define kernel_devel_post() \ %define kernel_devel_post() \
%{expand:%%post %{?1:%{1}-}devel}\ %{expand:%%post %{?1:%{1}-}devel}\
@ -2117,7 +2120,7 @@ if [ -f /etc/sysconfig/kernel ]\
then\ then\
. /etc/sysconfig/kernel || exit $?\ . /etc/sysconfig/kernel || exit $?\
fi\ fi\
if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ]\ if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink -a ! -e /run/ostree-booted ] \
then\ then\
(cd /usr/src/kernels/%{KVERREL}%{?1:+%{1}} &&\ (cd /usr/src/kernels/%{KVERREL}%{?1:+%{1}} &&\
/usr/bin/find . -type f | while read f; do\ /usr/bin/find . -type f | while read f; do\