0440703030
- PE: Demote from Master does not clear previous errors - crmd: Prevent secondary DC fencing resulting from CIB updates that are lost due to elections - crmd: Log duplicate DC detection as a WARNING not ERROR - crmd: Bug lf#2632 - Correctly handle nodes that return faster than stonith - Core: Treat GNUTLS_E_UNEXPECTED_PACKET_LENGTH as normal termination of a TLS session - cib: Call gnutls_bye() and shutdown() when disconnecting from remote TLS connections - cib: Remove disconnected remote connections from mainloop - cib: Attempt a graceful sign-off for remote TLS connections - Core: Ensure there is sufficient space for EOS when building short-form option strings (prevents segfault) - Core: Fix variable expansion in pkg-config files - PE: Resolve memory leak reported by valgrind - PE: Fix memory leak for re-allocated resources reported by valgrind - PE: Improve the merging with template's operations - crmd: Allow nodes to fence themselves if they're the last one standing (lf#2584) - stonith: Add an API call for listing installed agents - stonith: Allow the fencing history to be queried - stonith: Ensure completed operations are recorded as such in the history - stonith: Support --quiet to display just the seconds since epoch at which a node was last shot - stonith: Serialize actions for a given device - stonith: Add missing entries to stonith_error2string() (missing OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=18
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
# HG changeset patch
|
|
# User Dejan Muhamedagic <dejan@hello-penguin.com>
|
|
# Date 1313589488 -7200
|
|
# Node ID 0abb257259ed722abaa32a237c3c284c08ec0737
|
|
# Parent 3681d3471fdecde109ea7c25ab2ceb31e1e8646f
|
|
Low: Shell: add crm execute directory to the PATH if not already present (bnc#712605)
|
|
|
|
Important if crm is run as non-root user. We use sys.argv[0],
|
|
but perhaps it'd be better to use autoconf @sbindir@ (or however
|
|
it's named) and set it in vars.sbindir.
|
|
|
|
diff --git a/shell/modules/main.py b/shell/modules/main.py
|
|
--- a/shell/modules/main.py
|
|
+++ b/shell/modules/main.py
|
|
@@ -16,6 +16,7 @@
|
|
#
|
|
|
|
import sys
|
|
+import os
|
|
import shlex
|
|
import getopt
|
|
|
|
@@ -205,7 +206,10 @@ vars = Vars.getInstance()
|
|
levels = Levels.getInstance()
|
|
|
|
# prefer the user set PATH
|
|
-os.putenv("PATH", "%s:%s" % (os.getenv("PATH"),vars.crm_daemon_dir))
|
|
+mybinpath = os.path.dirname(sys.argv[0])
|
|
+for p in mybinpath, vars.crm_daemon_dir:
|
|
+ if p not in os.environ["PATH"].split(':'):
|
|
+ os.environ['PATH'] = "%s:%s" % (os.environ['PATH'], p)
|
|
|
|
def set_interactive():
|
|
'''Set the interactive option only if we're on a tty.'''
|