Attachment #193312 for bug #228186

View | Details | Raw Unified | Return to bug 228186
Collapse All | Expand All




# Created by: David Shane Holden <dpejesh@yahoo.com>
# $FreeBSD$

PORTNAME=		crmsh
PORTVERSION=		3.0.1
CATEGORIES=		net-mgmt python
CATEGORIES=	net-mgmt python

MAINTAINER=		dpejesh@yahoo.com
COMMENT=		Command-line interface for High-Availability cluster management

LICENSE=		GPLv2
LICENSE_FILE=		${WRKSRC}/COPYING

# Set the build/run depends on setuptools instead of adding distutils to USE_PYTHON
# because the crmsh build uses autotools which then calls setup.py.
BUILD_DEPENDS=		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}parallax>0:devel/py-parallax@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}

USE_GITHUB=		yes
GH_ACCOUNT=		ClusterLabs

USES=			autoreconf gmake python:2.7 shebangfix
GNU_CONFIGURE=		yes
CONFIGURE_ARGS=		--with-ocf-root=${PREFIX}/lib/ocf
NO_ARCH=		yes
NO_ARCH=	yes

SHEBANG_FILES=		bin/crm \
			scripts/*/*.py \
			test/cib-tests.sh \
			test/evaltest.sh \
			test/list-undocumented-commands.py \
			utils/crm_clean.py \
			utils/crm_pkg.py \
			utils/crm_rpmcheck.py

OPTIONS_DEFINE=		DOCS MANPAGES
OPTIONS_DEFAULT=	MANPAGES
OPTIONS_SUB=		yes

DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc


MANPAGES_BUILD_DEPENDS=	${DOCS_BUILD_DEPENDS}

post-patch:
	@${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/setup.py
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/corosync.py
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/utils.py
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/hb_report.in
	@${REINPLACE_CMD} 's,%%PYTHON_CMD%%,${PYTHON_CMD},g' ${WRKSRC}/hb_report/hb_report.in
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/openais_conf_support.sh
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/utillib.sh
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/scripts/health/collect.py
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/utils/crm_init.py

post-install:
	${MV} ${STAGEDIR}${PREFIX}/etc/crm/crm.conf \

Lines 1-3 Link Here

(-)crmsh/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1495219830	1	TIMESTAMP = 1523916691
2	SHA256 (ClusterLabs-crmsh-3.0.0_GH0.tar.gz) = eb3d99999b7f1e31fef28de90fa5b038f316a02a35c47a1286d374eb7a569168	2	SHA256 (ClusterLabs-crmsh-3.0.1_GH0.tar.gz) = de10df384d3a5b5700cce96b9e907c2e5c17bffc376bc65503f50219d9812b15
3	SIZE (ClusterLabs-crmsh-3.0.0_GH0.tar.gz) = 943585	3	SIZE (ClusterLabs-crmsh-3.0.1_GH0.tar.gz) = 947261

Line 0 Link Here

(-)crmsh/files/patch-crmsh_corosync.py (+11 lines)
	1	--- crmsh/corosync.py.orig 2018-04-19 03:47:12 UTC
	2	+++ crmsh/corosync.py
	3	@@ -14,7 +14,7 @@ from .msg import err_buf, common_debug
	4
	5
	6	def conf():
	7	- return os.getenv('COROSYNC_MAIN_CONFIG_FILE', '/etc/corosync/corosync.conf')
	8	+ return os.getenv('COROSYNC_MAIN_CONFIG_FILE', '%%PREFIX%%/etc/corosync/corosync.conf')
	9
	10
	11	def is_corosync_stack():




--- crmsh/utils.py.orig	2018-04-19 03:54:07 UTC
+++ crmsh/utils.py
@@ -989,7 +989,7 @@ def cluster_stack():
         return "heartbeat"
     elif is_process("[a]isexec"):
         return "openais"
-    elif os.path.exists("/etc/corosync/corosync.conf") or is_program('corosync-cfgtool'):
+    elif os.path.exists("%%PREFIX%%/etc/corosync/corosync.conf") or is_program('corosync-cfgtool'):
         return "corosync"
     return ""
 
@@ -1551,7 +1551,7 @@ def list_corosync_node_names():
     in corosync.conf
     '''
     try:
-        cfg = os.getenv('COROSYNC_MAIN_CONFIG_FILE', '/etc/corosync/corosync.conf')
+        cfg = os.getenv('COROSYNC_MAIN_CONFIG_FILE', '%%PREFIX%%/etc/corosync/corosync.conf')
         lines = open(cfg).read().split('\n')
         name_re = re.compile(r'\s*name:\s+(.*)')
         names = []
@@ -1570,7 +1570,7 @@ def list_corosync_nodes():
     in corosync.conf
     '''
     try:
-        cfg = os.getenv('COROSYNC_MAIN_CONFIG_FILE', '/etc/corosync/corosync.conf')
+        cfg = os.getenv('COROSYNC_MAIN_CONFIG_FILE', '%%PREFIX%%/etc/corosync/corosync.conf')
         lines = open(cfg).read().split('\n')
         addr_re = re.compile(r'\s*ring0_addr:\s+(.*)')
         nodes = []




--- hb_report/hb_report.in.orig	2017-07-21 09:17:13 UTC
+++ hb_report/hb_report.in
@@ -203,11 +203,11 @@ time2str() {
 }
 # try to figure out where pacemaker ... etc
 get_pe_state_dir() {
-	PE_STATE_DIR=`python -c "import crmsh.config; print crmsh.config.path.pe_state_dir"`
+	PE_STATE_DIR=`%%PYTHON_CMD%% -c "import crmsh.config; print(crmsh.config.path.pe_state_dir)"`
 	test -d "$PE_STATE_DIR"
 }
 get_cib_dir() {
-	CIB_DIR=`python -c "import crmsh.config; print crmsh.config.path.crm_config"`
+	CIB_DIR=`%%PYTHON_CMD%% -c "import crmsh.config; print(crmsh.config.path.crm_config)"`
 	test -d "$CIB_DIR"
 }
 get_pe_state_dir2() {
@@ -357,7 +357,7 @@ is_our_log() {
 	local cat
 	cat=`find_decompressor $logf`
 	local first_time="`$cat $logf | head -10 | find_first_ts`"
-	local last_time="`$cat $logf | tail -10 | tac | find_first_ts`"
+	local last_time="`$cat $logf | tail -10 | tail -r | find_first_ts`"
 	if [ x = "x$first_time" -o x = "x$last_time" ]; then
 		return 0 # skip (empty log?)
 	fi
@@ -467,7 +467,7 @@ loginfo() {
 	local logf=$1
 	local fake=$2
 	local nextpos
-	nextpos=`python -c "f=open('$logf');f.seek(0,2);print f.tell()+1"`
+	nextpos=`%%PYTHON_CMD%% -c "f=open('$logf');f.seek(0,2);print f.tell()+1"`
 	if [ "$fake" ]; then
 		echo "synthetic:$logf $nextpos"
 	else
@@ -1206,7 +1206,7 @@ which which >/dev/null 2>&1 ||
 	fatal "please install the which(1) program"
 
 WE=`uname -n`  # who am i?
-tmpdir=`mktemp -t -d .hb_report.workdir.XXXXXX` ||
+tmpdir=`mktemp -d` ||
 	fatal "disk full"
 add_tmpfiles $tmpdir
 WORKDIR=$tmpdir
@@ -1322,7 +1322,7 @@ glibc
 "
 case "$CLUSTER_TYPE" in
 openais)
-	CONF=/etc/corosync/corosync.conf # corosync?
+	CONF=%%PREFIX%%/etc/corosync/corosync.conf # corosync?
 	if test -f $CONF; then
 		CORES_DIRS="$CORES_DIRS /var/lib/corosync"
 	else




--- hb_report/openais_conf_support.sh.orig	2018-04-19 04:02:39 UTC
+++ hb_report/openais_conf_support.sh
@@ -70,8 +70,8 @@ getlogvars() {
 }
 cluster_info() {
 	: echo "openais version: how?"
-	if [ "$CONF" = /etc/corosync/corosync.conf ]; then
-		/usr/sbin/corosync -v
+	if [ "$CONF" = %%PREFIX%%/etc/corosync/corosync.conf ]; then
+		%%PREFIX%%/sbin/corosync -v
 	fi
 }
 essential_files() {




--- hb_report/utillib.sh.orig	2017-07-21 09:17:13 UTC
+++ hb_report/utillib.sh
@@ -8,7 +8,7 @@
 get_cluster_type() {
 	if ps -ef | egrep -qs '[a]isexec|[c]orosync' ||
 			[ -f /etc/ais/openais.conf -a ! -f "$HA_CF" ] ||
-			[ -f /etc/corosync/corosync.conf -a ! -f "$HA_CF" ]
+			[ -f %%PREFIX%%/etc/corosync/corosync.conf -a ! -f "$HA_CF" ]
 	then
 		debug "this is OpenAIS cluster stack"
 		echo "openais"
@@ -525,7 +525,7 @@ crmconfig() {
 		CIB_file=$1/$CIB_F crm configure show >$1/$CIB_TXT_F 2>&1
 }
 get_crm_nodes() {
-	/usr/sbin/crm node server
+	%%PREFIX%%/bin/crm node server
 }
 get_live_nodes() {
 	if [ `id -u` = 0 ] && which fping >/dev/null 2>&1; then

Line 0 Link Here

(-)crmsh/files/patch-scripts_health_collect.py (+11 lines)
	1	--- scripts/health/collect.py.orig 2018-04-19 04:04:24 UTC
	2	+++ scripts/health/collect.py
	3	@@ -67,7 +67,7 @@ def disk_info():
	4	FILES = [
	5	'/etc/csync2/key_hagroup',
	6	'/etc/csync2/csync2.cfg',
	7	- '/etc/corosync/corosync.conf',
	8	+ '%%PREFIX%%/etc/corosync/corosync.conf',
	9	'/etc/sysconfig/sbd',
	10	'/etc/sysconfig/SuSEfirewall2',
	11	'/etc/sysconfig/SuSEfirewall2.d/services/cluster'




--- utils/crm_init.py.orig	2018-04-19 04:05:44 UTC
+++ utils/crm_init.py
@@ -13,7 +13,7 @@ SERVICES = ['sshd', 'ntp', 'corosync', '
 SSH_KEY = os.path.expanduser('~/.ssh/id_rsa')
 CSYNC2_KEY = '/etc/csync2/key_hagroup'
 CSYNC2_CFG = '/etc/csync2/csync2.cfg'
-COROSYNC_CONF = '/etc/corosync/corosync.conf'
+COROSYNC_CONF = '%%PREFIX%%/etc/corosync/corosync.conf'
 SYSCONFIG_SBD = '/etc/sysconfig/sbd'
 SYSCONFIG_FW = '/etc/sysconfig/SuSEfirewall2'
 SYSCONFIG_FW_CLUSTER = '/etc/sysconfig/SuSEfirewall2.d/services/cluster'
@@ -107,7 +107,7 @@ def files_info():
 
 def logrotate_info():
     rc, _, _ = crm_script.call(
-        'grep -r corosync.conf /etc/logrotate.d',
+        'grep -r corosync.conf %%PREFIX%%/etc/logrotate.d',
         shell=True)
     return {'corosync.conf': rc == 0}
 

Lines 1-9 Link Here

(-)crmsh/pkg-plist (-5 / +5 lines)
1	@sample etc/crm/crm.conf.sample	1	@sample etc/crm/crm.conf.sample
2	%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO	2	%%PYTHON_SITELIBDIR%%/crmsh-3.0.1-py%%PYTHON_VER%%.egg-info/PKG-INFO
3	%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt	3	%%PYTHON_SITELIBDIR%%/crmsh-3.0.1-py%%PYTHON_VER%%.egg-info/SOURCES.txt
4	%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt	4	%%PYTHON_SITELIBDIR%%/crmsh-3.0.1-py%%PYTHON_VER%%.egg-info/dependency_links.txt
5	%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/requires.txt	5	%%PYTHON_SITELIBDIR%%/crmsh-3.0.1-py%%PYTHON_VER%%.egg-info/requires.txt
6	%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/top_level.txt	6	%%PYTHON_SITELIBDIR%%/crmsh-3.0.1-py%%PYTHON_VER%%.egg-info/top_level.txt
7	%%PYTHON_SITELIBDIR%%/crmsh/__init__.py	7	%%PYTHON_SITELIBDIR%%/crmsh/__init__.py
8	%%PYTHON_SITELIBDIR%%/crmsh/__init__.pyc	8	%%PYTHON_SITELIBDIR%%/crmsh/__init__.pyc
9	%%PYTHON_SITELIBDIR%%/crmsh/bootstrap.py	9	%%PYTHON_SITELIBDIR%%/crmsh/bootstrap.py

Return to bug 228186

Lines 1-45 Link Here

(-)crmsh/Makefile (-32 / +40 lines)
1	# Created by: dpejesh@yahoo.com	1	# Created by: David Shane Holden <dpejesh@yahoo.com>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= crmsh	4	PORTNAME= crmsh
5	PORTVERSION= 3.0.0	5	PORTVERSION= 3.0.1
6	PORTREVISION= 1	6	CATEGORIES= net-mgmt python
7	CATEGORIES= net-mgmt python
8		7
9	MAINTAINER= dpejesh@yahoo.com	8	MAINTAINER= dpejesh@yahoo.com
10	COMMENT= Command-line interface for High-Availability cluster management	9	COMMENT= Command-line interface for High-Availability cluster management
11		10
12	LICENSE= GPLv2	11	LICENSE= GPLv2
13	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
14		13
15	# Set the build/run depends on setuptools instead of adding distutils to USE_PYTHON	14	# Set the build/run depends on setuptools instead of adding distutils to USE_PYTHON
16	# because the crmsh build uses autotools which then calls setup.py.	15	# because the crmsh build uses autotools which then calls setup.py.
17	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR}	16	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
18	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \	17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \	18	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}	19	${PYTHON_PKGNAMEPREFIX}parallax>0:devel/py-parallax@${PY_FLAVOR} \
		20	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
		21	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
21		22
22	USE_GITHUB= yes	23	USE_GITHUB= yes
23	GH_ACCOUNT= ClusterLabs	24	GH_ACCOUNT= ClusterLabs
24		25
25	USES= autoreconf gmake python:2.7 shebangfix	26	USES= autoreconf gmake python:2.7 shebangfix
26	USE_PYTHON= flavors	27	GNU_CONFIGURE= yes
27	GNU_CONFIGURE= yes	28	CONFIGURE_ARGS= --with-ocf-root=${PREFIX}/lib/ocf
28	CONFIGURE_ARGS= --with-ocf-root=${PREFIX}/lib/ocf	29	NO_ARCH= yes
29	NO_ARCH= yes
30		30
31	SHEBANG_FILES= bin/crm \	31	SHEBANG_FILES= bin/crm \
32	scripts//.py \	32	scripts//.py \
33	test/cib-tests.sh \	33	test/cib-tests.sh \
34	test/evaltest.sh \	34	test/evaltest.sh \
35	test/list-undocumented-commands.py \	35	test/list-undocumented-commands.py \
36	utils/crm_clean.py \	36	utils/crm_clean.py \
37	utils/crm_pkg.py \	37	utils/crm_pkg.py \
38	utils/crm_rpmcheck.py	38	utils/crm_rpmcheck.py
39		39
40	OPTIONS_DEFINE= DOCS MANPAGES	40	OPTIONS_DEFINE= DOCS MANPAGES
41	OPTIONS_DEFAULT=MANPAGES	41	OPTIONS_DEFAULT= MANPAGES
42	OPTIONS_SUB= yes	42	OPTIONS_SUB= yes
43		43
44	DOCS_BUILD_DEPENDS= asciidoc:textproc/asciidoc	44	DOCS_BUILD_DEPENDS= asciidoc:textproc/asciidoc
45		45
Lines 46-52 Link Here
46	MANPAGES_BUILD_DEPENDS= ${DOCS_BUILD_DEPENDS}	46	MANPAGES_BUILD_DEPENDS= ${DOCS_BUILD_DEPENDS}
47		47
48	post-patch:	48	post-patch:
49	${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},' ${WRKSRC}/setup.py	49	@${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/setup.py
		50	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/corosync.py
		51	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/utils.py
		52	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/hb_report.in
		53	@${REINPLACE_CMD} 's,%%PYTHON_CMD%%,${PYTHON_CMD},g' ${WRKSRC}/hb_report/hb_report.in
		54	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/openais_conf_support.sh
		55	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/utillib.sh
		56	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/scripts/health/collect.py
		57	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/utils/crm_init.py
50		58
51	post-install:	59	post-install:
52	${MV} ${STAGEDIR}${PREFIX}/etc/crm/crm.conf \	60	${MV} ${STAGEDIR}${PREFIX}/etc/crm/crm.conf \

Line 0 Link Here

(-)crmsh/files/patch-crmsh_utils.py (+29 lines)
	1	--- crmsh/utils.py.orig 2018-04-19 03:54:07 UTC
	2	+++ crmsh/utils.py
	3	@@ -989,7 +989,7 @@ def cluster_stack():
	4	return "heartbeat"
	5	elif is_process("[a]isexec"):
	6	return "openais"
	7	- elif os.path.exists("/etc/corosync/corosync.conf") or is_program('corosync-cfgtool'):
	8	+ elif os.path.exists("%%PREFIX%%/etc/corosync/corosync.conf") or is_program('corosync-cfgtool'):
	9	return "corosync"
	10	return ""
	11
	12	@@ -1551,7 +1551,7 @@ def list_corosync_node_names():
	13	in corosync.conf
	14	'''
	15	try:
	16	- cfg = os.getenv('COROSYNC_MAIN_CONFIG_FILE', '/etc/corosync/corosync.conf')
	17	+ cfg = os.getenv('COROSYNC_MAIN_CONFIG_FILE', '%%PREFIX%%/etc/corosync/corosync.conf')
	18	lines = open(cfg).read().split('\n')
	19	name_re = re.compile(r'\sname:\s+(.)')
	20	names = []
	21	@@ -1570,7 +1570,7 @@ def list_corosync_nodes():
	22	in corosync.conf
	23	'''
	24	try:
	25	- cfg = os.getenv('COROSYNC_MAIN_CONFIG_FILE', '/etc/corosync/corosync.conf')
	26	+ cfg = os.getenv('COROSYNC_MAIN_CONFIG_FILE', '%%PREFIX%%/etc/corosync/corosync.conf')
	27	lines = open(cfg).read().split('\n')
	28	addr_re = re.compile(r'\sring0_addr:\s+(.)')
	29	nodes = []

Line 0 Link Here

(-)crmsh/files/patch-hb__report_hb__report.in (+52 lines)
	1	--- hb_report/hb_report.in.orig 2017-07-21 09:17:13 UTC
	2	+++ hb_report/hb_report.in
	3	@@ -203,11 +203,11 @@ time2str() {
	4	}
	5	# try to figure out where pacemaker ... etc
	6	get_pe_state_dir() {
	7	- PE_STATE_DIR=`python -c "import crmsh.config; print crmsh.config.path.pe_state_dir"`
	8	+ PE_STATE_DIR=`%%PYTHON_CMD%% -c "import crmsh.config; print(crmsh.config.path.pe_state_dir)"`
	9	test -d "$PE_STATE_DIR"
	10	}
	11	get_cib_dir() {
	12	- CIB_DIR=`python -c "import crmsh.config; print crmsh.config.path.crm_config"`
	13	+ CIB_DIR=`%%PYTHON_CMD%% -c "import crmsh.config; print(crmsh.config.path.crm_config)"`
	14	test -d "$CIB_DIR"
	15	}
	16	get_pe_state_dir2() {
	17	@@ -357,7 +357,7 @@ is_our_log() {
	18	local cat
	19	cat=`find_decompressor $logf`
	20	local first_time="`$cat $logf \| head -10 \| find_first_ts`"
	21	- local last_time="`$cat $logf \| tail -10 \| tac \| find_first_ts`"
	22	+ local last_time="`$cat $logf \| tail -10 \| tail -r \| find_first_ts`"
	23	if [ x = "x$first_time" -o x = "x$last_time" ]; then
	24	return 0 # skip (empty log?)
	25	fi
	26	@@ -467,7 +467,7 @@ loginfo() {
	27	local logf=$1
	28	local fake=$2
	29	local nextpos
	30	- nextpos=`python -c "f=open('$logf');f.seek(0,2);print f.tell()+1"`
	31	+ nextpos=`%%PYTHON_CMD%% -c "f=open('$logf');f.seek(0,2);print f.tell()+1"`
	32	if [ "$fake" ]; then
	33	echo "synthetic:$logf $nextpos"
	34	else
	35	@@ -1206,7 +1206,7 @@ which which >/dev/null 2>&1 \|\|
	36	fatal "please install the which(1) program"
	37
	38	WE=`uname -n` # who am i?
	39	-tmpdir=`mktemp -t -d .hb_report.workdir.XXXXXX` \|\|
	40	+tmpdir=`mktemp -d` \|\|
	41	fatal "disk full"
	42	add_tmpfiles $tmpdir
	43	WORKDIR=$tmpdir
	44	@@ -1322,7 +1322,7 @@ glibc
	45	"
	46	case "$CLUSTER_TYPE" in
	47	openais)
	48	- CONF=/etc/corosync/corosync.conf # corosync?
	49	+ CONF=%%PREFIX%%/etc/corosync/corosync.conf # corosync?
	50	if test -f $CONF; then
	51	CORES_DIRS="$CORES_DIRS /var/lib/corosync"
	52	else

Line 0 Link Here

(-)crmsh/files/patch-hb__report_openais__conf__support.sh (+13 lines)
	1	--- hb_report/openais_conf_support.sh.orig 2018-04-19 04:02:39 UTC
	2	+++ hb_report/openais_conf_support.sh
	3	@@ -70,8 +70,8 @@ getlogvars() {
	4	}
	5	cluster_info() {
	6	: echo "openais version: how?"
	7	- if [ "$CONF" = /etc/corosync/corosync.conf ]; then
	8	- /usr/sbin/corosync -v
	9	+ if [ "$CONF" = %%PREFIX%%/etc/corosync/corosync.conf ]; then
	10	+ %%PREFIX%%/sbin/corosync -v
	11	fi
	12	}
	13	essential_files() {

Line 0 Link Here

(-)crmsh/files/patch-hb__report_utillib.sh (+20 lines)
	1	--- hb_report/utillib.sh.orig 2017-07-21 09:17:13 UTC
	2	+++ hb_report/utillib.sh
	3	@@ -8,7 +8,7 @@
	4	get_cluster_type() {
	5	if ps -ef \| egrep -qs '[a]isexec\|[c]orosync' \|\|
	6	[ -f /etc/ais/openais.conf -a ! -f "$HA_CF" ] \|\|
	7	- [ -f /etc/corosync/corosync.conf -a ! -f "$HA_CF" ]
	8	+ [ -f %%PREFIX%%/etc/corosync/corosync.conf -a ! -f "$HA_CF" ]
	9	then
	10	debug "this is OpenAIS cluster stack"
	11	echo "openais"
	12	@@ -525,7 +525,7 @@ crmconfig() {
	13	CIB_file=$1/$CIB_F crm configure show >$1/$CIB_TXT_F 2>&1
	14	}
	15	get_crm_nodes() {
	16	- /usr/sbin/crm node server
	17	+ %%PREFIX%%/bin/crm node server
	18	}
	19	get_live_nodes() {
	20	if [ `id -u` = 0 ] && which fping >/dev/null 2>&1; then

Line 0 Link Here

(-)crmsh/files/patch-utils_crm__init.py (+20 lines)
	1	--- utils/crm_init.py.orig 2018-04-19 04:05:44 UTC
	2	+++ utils/crm_init.py
	3	@@ -13,7 +13,7 @@ SERVICES = ['sshd', 'ntp', 'corosync', '
	4	SSH_KEY = os.path.expanduser('~/.ssh/id_rsa')
	5	CSYNC2_KEY = '/etc/csync2/key_hagroup'
	6	CSYNC2_CFG = '/etc/csync2/csync2.cfg'
	7	-COROSYNC_CONF = '/etc/corosync/corosync.conf'
	8	+COROSYNC_CONF = '%%PREFIX%%/etc/corosync/corosync.conf'
	9	SYSCONFIG_SBD = '/etc/sysconfig/sbd'
	10	SYSCONFIG_FW = '/etc/sysconfig/SuSEfirewall2'
	11	SYSCONFIG_FW_CLUSTER = '/etc/sysconfig/SuSEfirewall2.d/services/cluster'
	12	@@ -107,7 +107,7 @@ def files_info():
	13
	14	def logrotate_info():
	15	rc, _, _ = crm_script.call(
	16	- 'grep -r corosync.conf /etc/logrotate.d',
	17	+ 'grep -r corosync.conf %%PREFIX%%/etc/logrotate.d',
	18	shell=True)
	19	return {'corosync.conf': rc == 0}
	20