From c9536aa970b45d4836b2440f60ba6cdb7c4c4198 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 19 Apr 2012 12:40:59 +0000 Subject: [PATCH] - check if date.timezone is set, report it and set something if not, as it gives tons of errors in install log - some MySQL packages (mysql.com, MariaDB, ...) use "mysql" as service name instead of RH default "mysqld" --- doc/rpm-build/post_install.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php index 8f4d2d1ac6..4a831c1c93 100755 --- a/doc/rpm-build/post_install.php +++ b/doc/rpm-build/post_install.php @@ -76,6 +76,14 @@ if (($lang = isset($_ENV['LANG']) ? $_ENV['LANG'] : $_SERVER['LANG'])) } $config['source_dir'] = dirname(dirname(dirname(__FILE__))); +// check if date.timezone is set, report it and set something if not, as it gives tons of errors in install log +if (!ini_get('date.timezone')) +{ + if (!($tz = date_default_timezone_get())) $tz = 'UTC'; + echo "No default timezone (php.ini date.timezone) set, we temporary set '$tz'. You should fix that permanent!\n"; + ini_set('date.timezone',$tz); +} + /** * Set distribution spezific defaults * @@ -133,7 +141,15 @@ function set_distro_defaults($distro=null) default: $config['distro'] = 'rh'; // fall through - case 'rh': // nothing to do, defaults are already set + case 'rh': + // some MySQL packages (mysql.com, MariaDB, ...) use "mysql" as service name instead of RH default "mysqld" + if (!file_exists('/etc/init.d/mysqld') && file_exists('/etc/init.d/mysql')) + { + foreach(array('start_db','autostart_db') as $name) + { + $config[$name] = str_replace('mysqld','mysql',$config[$name]); + } + } break; } }