SPECS: squid.spec - fix hostname being unable to give hostname pre...

glen glen at pld-linux.org
Mon Aug 15 18:52:34 CEST 2005


Author: glen                         Date: Mon Aug 15 16:52:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix hostname being unable to give hostname preventing squid install and cache directory initialized; rel 3, STBR

---- Files affected:
SPECS:
   squid.spec (1.215 -> 1.216) 

---- Diffs:

================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.215 SPECS/squid.spec:1.216
--- SPECS/squid.spec:1.215	Wed May 25 14:32:41 2005
+++ SPECS/squid.spec	Mon Aug 15 18:52:29 2005
@@ -12,7 +12,7 @@
 Summary(zh_CN):	SQUID ¸ßËŮťşłĺ´úŔíˇţÎńĆ÷
 Name:		squid
 Version:	2.5.STABLE10
-Release:	2
+Release:	3
 Epoch:		7
 License:	GPL v2
 Group:		Networking/Daemons
@@ -542,7 +542,8 @@
 
 %post
 if ! grep -q "^visible_hostname" /etc/squid/squid.conf; then
-	echo visible_hostname `/bin/hostname -f` >> /etc/squid/squid.conf
+	hostname=`/bin/hostname -f 2>/dev/null` || hostname='localhost'
+	echo visible_hostname $hostname >> /etc/squid/squid.conf
 fi
 
 if [ "$1" = "1" ]; then
@@ -734,6 +735,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.216  2005/08/15 16:52:29  glen
+- fix hostname being unable to give hostname preventing squid install and cache directory initialized; rel 3, STBR
+
 Revision 1.215  2005/05/25 12:32:41  hawk
 - works for me, release 2 (1 for Ra)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/squid.spec?r1=1.215&r2=1.216&f=u




More information about the pld-cvs-commit mailing list