Skip to content

Commit

Permalink
Low: build: Move binaries in /usr/lib/heartbeat to /usr/libexec/heart…
Browse files Browse the repository at this point in the history 
…beat to avoid multi-lib inconsistencies
  • Loading branch information
@davidvossel
davidvossel committed Jul 30, 2013
1 parent 4ab538c commit 1e79b78
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion heartbeat/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ EXTRA_DIST = $(ocf_SCRIPTS) $(ocfcommon_DATA) \

INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/linux-ha

halibdir = $(libdir)/heartbeat
halibdir = $(libexecdir)/heartbeat

ocfdir = $(OCF_RA_DIR_PREFIX)/heartbeat

Expand Down
2 changes: 1 addition & 1 deletion heartbeat/ocf-directories.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@
: ${HA_RSCTMP:=@HA_RSCTMPDIR@}
: ${HA_RSCTMP_OLD:=@HA_VARRUNDIR@/heartbeat/rsctmp}
: ${HA_FIFO:=@localstatedir@/lib/heartbeat/fifo}
: ${HA_BIN:=@libdir@/heartbeat}
: ${HA_BIN:=@libexecdir@/heartbeat}
: ${HA_SBIN_DIR:=@sbindir@}
: ${HA_DATEFMT:="%Y/%m/%d_%T "}
: ${HA_DEBUGLOG:=/dev/null}
Expand Down
2 changes: 1 addition & 1 deletion resource-agents.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/ha.d
%{_sysconfdir}/ha.d/shellfuncs

%{_libdir}/heartbeat
%{_libexecdir}/heartbeat

%post -n resource-agents
if [ $1 = 2 ]; then
Expand Down
2 changes: 1 addition & 1 deletion tools/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SUBDIRS = ocft

INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include

halibdir = $(libdir)/heartbeat
halibdir = $(libexecdir)/heartbeat

EXTRA_DIST = ocf-tester.8 sfex_init.8

Expand Down

1 comment on commit 1e79b78

@joelgriffiths
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This appears to break the HA_BIN directory for 64bit heartbeat which is stored in /usr/lib64/heartbeat/heartbeat for the current combination of epel and cent6 update packages:
heartbeat-3.0.4-1.el6.x86_64
heartbeat-libs-3.0.4-1.el6.x86_64
resource-agents-3.9.2-21.el6_4.8.x86_64
The heartbeat init script starts looking for the 64b heartbeat package in the libexec location.

I just added a symlink to deal with the problem on the production systems I own:
mkdir -p /usr/libexec/heartbeat; ln -s /usr/lib64/heartbeat/heartbeat /usr/libexec/heartbeat/heartbeat

Please sign in to comment.