Rebase to resource-agents 3.9.7 upstream release.
This commit is contained in:
parent
1d299fd67d
commit
3e00b63666
19
fix-non-executable-script-errors.patch
Normal file
19
fix-non-executable-script-errors.patch
Normal file
@ -0,0 +1,19 @@
|
||||
diff -uNr a/heartbeat/findif.sh b/heartbeat/findif.sh
|
||||
--- a/heartbeat/findif.sh 2016-02-03 11:57:55.000000000 +0100
|
||||
+++ b/heartbeat/findif.sh 2016-02-08 16:55:32.155404148 +0100
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/bin/sh
|
||||
ipcheck_ipv4() {
|
||||
local r1_to_255="([1-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-5])"
|
||||
local r0_to_255="([0-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-5])"
|
||||
diff -uNr a/heartbeat/mysql-common.sh b/heartbeat/mysql-common.sh
|
||||
--- a/heartbeat/mysql-common.sh 2016-02-03 11:57:55.000000000 +0100
|
||||
+++ b/heartbeat/mysql-common.sh 2016-02-08 16:55:01.619815789 +0100
|
||||
@@ -1,7 +1,3 @@
|
||||
-#!/bin/sh
|
||||
-
|
||||
-#######################################################################
|
||||
-
|
||||
# Attempt to detect a default binary
|
||||
OCF_RESKEY_binary_default=$(which mysqld_safe 2> /dev/null)
|
||||
if [ "$OCF_RESKEY_binary_default" = "" ]; then
|
@ -36,7 +36,7 @@
|
||||
Name: resource-agents
|
||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||
Version: 3.9.7
|
||||
Release: 2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
Release: 3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: https://github.com/ClusterLabs/resource-agents
|
||||
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
|
||||
|
Loading…
Reference in New Issue
Block a user