main/mariadb: reformat init script

1 files changed, 13 insertions, 12 deletions

diff --git a/main/mariadb/mariadb.initd b/main/mariadb/mariadb.initd
index 35906a3a8c..fb0c89a9e9 100644
--- a/main/mariadb/mariadb.initd
+++ b/main/mariadb/mariadb.initd
@@ -1,29 +1,20 @@
 #!/sbin/openrc-run
-
-getconf() {
-	v=$(my_print_defaults --mysqld | grep ^--$1)
-	[ -z $v ] && echo $2 || echo ${v#*=}
-}
+extra_stopped_commands="setup"
 
 retry="60"
-extra_stopped_commands="setup"
 command="/usr/bin/mysqld_safe"
 command_args="--syslog --nowatch"
+
 depend() {
 	use net
 	need localmount
 }
 
-setup() {
-	ebegin "Creating a new MySQL database"
-	mysql_install_db --user=mysql --datadir=/var/lib/mysql
-	eend $?
-}
-
 start_pre() {
 	pidfile=$(getconf pid-file "/run/mysqld/mysqld.pid")
 	command_args="$command_args --pid-file=$pidfile"
 	required_dirs=$(getconf datadir "/var/lib/mysql")
+
 	if [ ! -d $required_dirs/mysql ]; then
 		eerror "Datadir '$required_dirs' is empty or invalid."
 		eerror "Run '/etc/init.d/mariadb setup' to create new database."
@@ -38,3 +29,13 @@ stop_pre() {
 	pidfile=$(getconf pid-file "/run/mysqld/mysqld.pid")
 }
 
+setup() {
+	ebegin "Creating a new MySQL database"
+	mysql_install_db --user=mysql --datadir=/var/lib/mysql
+	eend $?
+}
+
+getconf() {
+	v=$(my_print_defaults --mysqld | grep ^--$1)
+	[ -z $v ] && echo $2 || echo ${v#*=}
+}