summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2019-10-30 20:34:01 +0000
committerLaura Abbott <labbott@fedoraproject.org>2019-10-30 20:34:01 +0000
commitd40f98744c85b77387c4fb0acaf2889bb0a4a1db (patch)
treec7923385785c7b8f6429048429721af864e14ed5
parent5919dc6ef7340eda54f01c44299cacf84f37ae77 (diff)
parentc5368cf9369d169697a164c9fc0d58a23b916b44 (diff)
downloadkernel-d40f98744c85b77387c4fb0acaf2889bb0a4a1db.tar.gz
kernel-d40f98744c85b77387c4fb0acaf2889bb0a4a1db.tar.xz
kernel-d40f98744c85b77387c4fb0acaf2889bb0a4a1db.zip
Merge #30 `devel: Don't run hardlink if rpm-ostree is in use`
-rw-r--r--kernel.spec5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index cc336470c..fa517ef4f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2110,6 +2110,9 @@ popd
#
# This macro defines a %%post script for a kernel*-devel package.
# %%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() \
%{expand:%%post %{?1:%{1}-}devel}\
@@ -2117,7 +2120,7 @@ if [ -f /etc/sysconfig/kernel ]\
then\
. /etc/sysconfig/kernel || exit $?\
fi\
-if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ]\
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink -a ! -e /run/ostree-booted ] \
then\
(cd /usr/src/kernels/%{KVERREL}%{?1:+%{1}} &&\
/usr/bin/find . -type f | while read f; do\