YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/unstable' into unstable

Browse source
This commit is contained in:
Weblate 2015-12-31 18:54:30 +01:00
commit 2fedf48226
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/hooks/conf_regen/34-mysql
View file

@ -26,7 +26,7 @@ if [[ "$(safe_copy my.cnf /etc/mysql/my.cnf | tail -n1)" == "True" ]]; then
fi fi
if [ ! -f /etc/yunohost/mysql ]; then if [ ! -f /etc/yunohost/mysql ]; then
[[ $(/bin/ps aux | grep mysqld | grep -vc "grep") == "0" ]] \ [[ $(/bin/ps aux | grep '[m]ysqld') == "0" ]] \
&& sudo service mysql start && sudo service mysql start
mysql_password=$(randpass 10 0) mysql_password=$(randpass 10 0)