SOURCES: mysql.init - bug: failing mysql init when hostname --fqdn...

[jezik]

Author: jezik                        Date: Fri Mar 14 15:25:03 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- bug: failing mysql init when hostname --fqdn == localhost

---- Files affected:
SOURCES:
   mysql.init (1.122 -> 1.123) 

---- Diffs:

================================================================
Index: SOURCES/mysql.init
diff -u SOURCES/mysql.init:1.122 SOURCES/mysql.init:1.123
--- SOURCES/mysql.init:1.122	Sat Nov 24 20:50:27 2007
+++ SOURCES/mysql.init	Fri Mar 14 16:24:58 2008
@@ -367,6 +367,7 @@
 
 	# Install this in the user table, too
 	hostname="`hostname --fqdn 2> /dev/null | tr -d '[:space:]'`"
+	[ "$hostname" = "localhost" -o -z "$hostname" ] && hostname="`hostname 2> /dev/null | tr -d '[:space:]'`"
 	[ -z "$hostname" ] && hostname="localhost-unknown"
 
 	# Check if hostname is valid
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mysql.init?r1=1.122&r2=1.123&f=u