|
 |
3e21ed |
diff -up galera-25.3.20/garb/files/garb.service.p2 galera-25.3.20/garb/files/garb.service
|
|
|
3e21ed |
--- galera-25.3.20/garb/files/garb.service.p2 2017-05-02 18:18:12.000000000 +0200
|
|
|
3e21ed |
+++ galera-25.3.20/garb/files/garb.service 2017-06-24 23:19:57.458471374 +0200
|
|
|
3e21ed |
@@ -10,8 +10,8 @@ Alias=garbd.service
|
|
|
3e21ed |
|
|
|
3e21ed |
[Service]
|
|
|
3e21ed |
User=nobody
|
|
|
3e21ed |
-EnvironmentFile=/etc/sysconfig/garb
|
|
|
3e21ed |
-ExecStart=/usr/bin/garb-systemd start
|
|
|
3e21ed |
+EnvironmentFile=@sysconfdir@/sysconfig/garb
|
|
|
3e21ed |
+ExecStart=@bindir@/garbd-systemd start
|
|
|
3e21ed |
|
|
|
3e21ed |
# Use SIGINT because with the default SIGTERM
|
|
|
3e21ed |
# garbd fails to reliably transition to 'destroyed' state
|
|
|
3e21ed |
diff -up galera-25.3.20/garb/files/garb.sh.p2 galera-25.3.20/garb/files/garb.sh
|
|
|
3e21ed |
--- galera-25.3.20/garb/files/garb.sh.p2 2017-05-02 18:18:12.000000000 +0200
|
|
|
3e21ed |
+++ galera-25.3.20/garb/files/garb.sh 2017-06-24 23:12:52.329066055 +0200
|
|
|
3e21ed |
@@ -5,7 +5,7 @@
|
|
|
3e21ed |
# init.d script for garbd
|
|
|
3e21ed |
#
|
|
|
3e21ed |
# chkconfig: - 99 01
|
|
|
3e21ed |
-# config: /etc/sysconfig/garb | /etc/default/garb
|
|
|
3e21ed |
+# config: @sysconfdir@/sysconfig/garb | @sysconfdir@/default/garb
|
|
|
3e21ed |
|
|
|
3e21ed |
### BEGIN INIT INFO
|
|
|
3e21ed |
# Provides: garb
|
|
|
3e21ed |
@@ -29,10 +29,10 @@ _SYSTEMCTL_SKIP_REDIRECT=true
|
|
|
3e21ed |
if [ -f /etc/redhat-release ]; then
|
|
|
3e21ed |
. /etc/init.d/functions
|
|
|
3e21ed |
. /etc/sysconfig/network
|
|
|
3e21ed |
- config=/etc/sysconfig/garb
|
|
|
3e21ed |
+ config=@sysconfdir@/sysconfig/garb
|
|
|
3e21ed |
else
|
|
|
3e21ed |
. /lib/lsb/init-functions
|
|
|
3e21ed |
- config=/etc/default/garb
|
|
|
3e21ed |
+ config=@sysconfdir@/default/garb
|
|
|
3e21ed |
fi
|
|
|
3e21ed |
|
|
|
3e21ed |
log_failure() {
|
|
|
3e21ed |
@@ -45,9 +45,9 @@ log_failure() {
|
|
|
3e21ed |
fi
|
|
|
3e21ed |
}
|
|
|
3e21ed |
|
|
|
3e21ed |
-PIDFILE=/var/run/garbd
|
|
|
3e21ed |
+PIDFILE=/var/run/@scl_prefix@garbd
|
|
|
3e21ed |
|
|
|
3e21ed |
-prog=$(which garbd)
|
|
|
3e21ed |
+prog="$(scl enable @scl@ -- which garbd)"
|
|
|
3e21ed |
|
|
|
3e21ed |
program_start() {
|
|
|
3e21ed |
local rcode
|
|
|
3e21ed |
@@ -154,6 +154,19 @@ restart() {
|
|
|
3e21ed |
start
|
|
|
3e21ed |
}
|
|
|
3e21ed |
|
|
|
3e21ed |
+# We have to re-enable SCL environment, because /sbin/service
|
|
|
3e21ed |
+# clears almost all environment variables.
|
|
|
3e21ed |
+# Since X_SCLS is cleared as well, we lose information about other
|
|
|
3e21ed |
+# collections enabled.
|
|
|
3e21ed |
+source @scl_scripts@/garbd-service-environment
|
|
|
3e21ed |
+source scl_source enable $@scl_upper@_SCLS_ENABLED
|
|
|
3e21ed |
+
|
|
|
3e21ed |
+# we want start daemon only inside "scl enable" invocation
|
|
|
3e21ed |
+if ! scl_enabled @scl@ ; then
|
|
|
3e21ed |
+ echo "Collection @scl@ has to be listed in @scl_scripts@/garbd-service-environment"
|
|
|
3e21ed |
+ exit 1
|
|
|
3e21ed |
+fi
|
|
|
3e21ed |
+
|
|
|
3e21ed |
# See how we were called.
|
|
|
3e21ed |
case "$1" in
|
|
|
3e21ed |
start)
|
|
|
3e21ed |
diff -up galera-25.3.20/garb/files/garb-systemd.p2 galera-25.3.20/garb/files/garb-systemd
|
|
|
3e21ed |
--- galera-25.3.20/garb/files/garb-systemd.p2 2017-05-02 18:18:12.000000000 +0200
|
|
|
3e21ed |
+++ galera-25.3.20/garb/files/garb-systemd 2017-06-24 23:06:12.176684549 +0200
|
|
|
3e21ed |
@@ -2,7 +2,7 @@
|
|
|
3e21ed |
#
|
|
|
3e21ed |
|
|
|
3e21ed |
|
|
|
3e21ed |
-config=/etc/sysconfig/garb
|
|
|
3e21ed |
+config=@sysconfdir@/sysconfig/garb
|
|
|
3e21ed |
|
|
|
3e21ed |
log_failure() {
|
|
|
3e21ed |
echo " ERROR! $@"
|
|
|
3e21ed |
@@ -12,7 +12,7 @@ log_failure() {
|
|
|
3e21ed |
|
|
|
3e21ed |
program_start() {
|
|
|
3e21ed |
echo "Starting garbd"
|
|
|
3e21ed |
- /usr/bin/garbd "$@"
|
|
|
3e21ed |
+ scl enable @scl@ -- @bindir@/garbd "$@"
|
|
|
3e21ed |
}
|
|
|
3e21ed |
|
|
|
3e21ed |
|