rpms/kernel/devel kernel-2.6.spec,1.1886,1.1887

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12195

Modified Files:
	kernel-2.6.spec 
Log Message:
Further improvements to the 'dont want to hardlink' case.
Now checks for HARDLINK="no" in /etc/sysconfig/kernel




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1886
retrieving revision 1.1887
diff -u -r1.1886 -r1.1887
--- kernel-2.6.spec	31 Jan 2006 23:49:57 -0000	1.1886
+++ kernel-2.6.spec	1 Feb 2006 01:51:19 -0000	1.1887
@@ -1200,7 +1200,8 @@
 /sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL}
 
 %post devel
-if [ -x /usr/sbin/hardlink ] ; then
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
   popd > /dev/null
@@ -1211,7 +1212,8 @@
 /sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp
 
 %post smp-devel
-if [ -x /usr/sbin/hardlink ] ; then
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-smp-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
   popd > /dev/null
@@ -1223,7 +1225,8 @@
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xen0-devel
-if [ -x /usr/sbin/hardlink ] ; then
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
   popd > /dev/null
@@ -1234,7 +1237,8 @@
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xenU-devel
-if [ -x /usr/sbin/hardlink ] ; then
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
   popd > /dev/null
@@ -1245,7 +1249,8 @@
 /sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump
 
 %post kdump-devel
-if [ -x /usr/sbin/hardlink ] ; then
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-kdump-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
   popd > /dev/null
@@ -1380,6 +1385,8 @@
 %changelog
 * Tue Jan 31 2006 Dave Jones <<davej at redhat.com>
 - Remove prereq on hardlink, making hardlinking of -devel packages optional
+- Further improvements to the 'dont want to hardlink' case.
+  Now checks for HARDLINK="no" in /etc/sysconfig/kernel
 
 * Tue Jan 31 2006 Don Zickus <<dzickus at redhat.com>
 - Enable x86-64 kdumping, and kdump related specfile cleanup.