| 1 |
commit: 0f5653d2d0a3d6a52cfd12f6329e948e8522698b |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 26 13:15:19 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 26 13:20:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5653d2 |
| 7 |
|
| 8 |
dev-db/mysql-init-scripts: Fix MariaDB-only option bug 626186, add supervisor script |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-db/mysql-init-scripts/files/init.d-2.2 | 2 +- |
| 13 |
dev-db/mysql-init-scripts/files/init.d-s6-2.2 | 2 +- |
| 14 |
.../files/{init.d-2.2 => init.d-supervise} | 27 +++++++--------------- |
| 15 |
...2.2.ebuild => mysql-init-scripts-2.2-r1.ebuild} | 1 + |
| 16 |
4 files changed, 11 insertions(+), 21 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-db/mysql-init-scripts/files/init.d-2.2 b/dev-db/mysql-init-scripts/files/init.d-2.2 |
| 19 |
index d217744de9c..124d2e993eb 100644 |
| 20 |
--- a/dev-db/mysql-init-scripts/files/init.d-2.2 |
| 21 |
+++ b/dev-db/mysql-init-scripts/files/init.d-2.2 |
| 22 |
@@ -15,7 +15,7 @@ depend() { |
| 23 |
} |
| 24 |
|
| 25 |
get_config() { |
| 26 |
- my_print_defaults --defaults-file="$1" --mysqld | |
| 27 |
+ my_print_defaults --defaults-file="$1" mysqld server mariadb | |
| 28 |
sed -n -e "s/^--$2=//p" |
| 29 |
} |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/dev-db/mysql-init-scripts/files/init.d-s6-2.2 b/dev-db/mysql-init-scripts/files/init.d-s6-2.2 |
| 33 |
index 427061aa990..46980fab9c3 100644 |
| 34 |
--- a/dev-db/mysql-init-scripts/files/init.d-s6-2.2 |
| 35 |
+++ b/dev-db/mysql-init-scripts/files/init.d-s6-2.2 |
| 36 |
@@ -9,7 +9,7 @@ depend() { |
| 37 |
} |
| 38 |
|
| 39 |
get_config() { |
| 40 |
- my_print_defaults --defaults-file="$1" --mysqld | |
| 41 |
+ my_print_defaults --defaults-file="$1" mysqld server mariadb | |
| 42 |
sed -n -e "s/^--$2=//p" |
| 43 |
} |
| 44 |
|
| 45 |
|
| 46 |
diff --git a/dev-db/mysql-init-scripts/files/init.d-2.2 b/dev-db/mysql-init-scripts/files/init.d-supervise |
| 47 |
similarity index 90% |
| 48 |
copy from dev-db/mysql-init-scripts/files/init.d-2.2 |
| 49 |
copy to dev-db/mysql-init-scripts/files/init.d-supervise |
| 50 |
index d217744de9c..5341a6a18d6 100644 |
| 51 |
--- a/dev-db/mysql-init-scripts/files/init.d-2.2 |
| 52 |
+++ b/dev-db/mysql-init-scripts/files/init.d-supervise |
| 53 |
@@ -15,7 +15,7 @@ depend() { |
| 54 |
} |
| 55 |
|
| 56 |
get_config() { |
| 57 |
- my_print_defaults --defaults-file="$1" --mysqld | |
| 58 |
+ my_print_defaults --defaults-file="$1" mysqld server mariadb | |
| 59 |
sed -n -e "s/^--$2=//p" |
| 60 |
} |
| 61 |
|
| 62 |
@@ -118,18 +118,16 @@ start() { |
| 63 |
fi |
| 64 |
|
| 65 |
local startup_timeout=${STARTUP_TIMEOUT:-900} |
| 66 |
- local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000} |
| 67 |
+# local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000} |
| 68 |
local tmpnice="${NICE:+"--nicelevel "}${NICE}" |
| 69 |
local tmpionice="${IONICE:+"--ionice "}${IONICE}" |
| 70 |
- start-stop-daemon \ |
| 71 |
+ supervise-daemon \ |
| 72 |
${DEBUG:+"--verbose"} \ |
| 73 |
- --start \ |
| 74 |
- --exec "${basedir}"/sbin/mysqld \ |
| 75 |
- --pidfile "${pidfile}" \ |
| 76 |
- --background \ |
| 77 |
- --wait ${startup_early_timeout} \ |
| 78 |
+ --pidfile "/run/${SVCNAME}.pid" \ |
| 79 |
${tmpnice} \ |
| 80 |
${tmpionice} \ |
| 81 |
+ --start \ |
| 82 |
+ "${basedir}"/sbin/mysqld \ |
| 83 |
-- --defaults-file="${MY_CNF}" ${MY_ARGS} |
| 84 |
local ret=$? |
| 85 |
if [ ${ret} -ne 0 ] ; then |
| 86 |
@@ -139,9 +137,6 @@ start() { |
| 87 |
|
| 88 |
ewaitfile ${startup_timeout} "${socket}" |
| 89 |
eend $? || return 1 |
| 90 |
- |
| 91 |
- save_options pidfile "${pidfile}" |
| 92 |
- save_options basedir "${basedir}" |
| 93 |
} |
| 94 |
|
| 95 |
stop() { |
| 96 |
@@ -151,16 +146,10 @@ stop() { |
| 97 |
|
| 98 |
ebegin "Stopping $(mysql_svcname)" |
| 99 |
|
| 100 |
- local pidfile="$(get_options pidfile)" |
| 101 |
- local basedir="$(get_options basedir)" |
| 102 |
- local stop_timeout=${STOP_TIMEOUT:-120} |
| 103 |
- |
| 104 |
- start-stop-daemon \ |
| 105 |
+ supervise-daemon \ |
| 106 |
${DEBUG:+"--verbose"} \ |
| 107 |
--stop \ |
| 108 |
- --exec "${basedir}"/sbin/mysqld \ |
| 109 |
- --pidfile "${pidfile}" \ |
| 110 |
- --retry ${stop_timeout} |
| 111 |
+ --pidfile "/run/${SVCNAME}.pid" |
| 112 |
eend $? |
| 113 |
} |
| 114 |
|
| 115 |
|
| 116 |
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild |
| 117 |
similarity index 96% |
| 118 |
rename from dev-db/mysql-init-scripts/mysql-init-scripts-2.2.ebuild |
| 119 |
rename to dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild |
| 120 |
index 13ebfb9e379..75b8390652f 100644 |
| 121 |
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2.ebuild |
| 122 |
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild |
| 123 |
@@ -37,6 +37,7 @@ src_install() { |
| 124 |
fi |
| 125 |
|
| 126 |
newinitd "${FILESDIR}/init.d-2.2" "mysql" |
| 127 |
+ newinitd "${FILESDIR}/init.d-supervise" "mysql-supervise" |
| 128 |
|
| 129 |
# systemd unit installation |
| 130 |
exeinto /usr/libexec |
Archives