[experimental-ims] 8d662f9 Only strip out -p to status/killproc for old fedora/RHEL

Geoff Simmons geoff at varnish-cache.org
Wed Aug 31 16:00:11 CEST 2011


commit 8d662f9c5be529c5f0ab0a3c1da6efda51a62b5d
Author: Tollef Fog Heen <tfheen at varnish-software.com>
Date:   Mon Aug 1 14:53:25 2011 +0200

    Only strip out -p to status/killproc for old fedora/RHEL
    
    It seems most RPM-based distros has the -p switch to killproc and
    status those days, so only blacklist the ones we know about that does
    not have it.
    
    Fixes: #969

diff --git a/redhat/varnish.spec b/redhat/varnish.spec
index d8b6fbb..ca282e2 100644
--- a/redhat/varnish.spec
+++ b/redhat/varnish.spec
@@ -110,7 +110,7 @@ EOF
 
 tail -n +11 etc/default.vcl >> redhat/default.vcl
 
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?rhel} <= 4 && 0%{?fedora} <= 8
+%if 0%{?fedora}%{?rhel} != 0 && 0%{?rhel} <= 4 && 0%{?fedora} <= 8
 	# Old style daemon function
 	sed -i 's,--pidfile \$pidfile,,g;
 		s,status -p \$pidfile,status,g;



More information about the varnish-commit mailing list