diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2011-09-24 20:50:35 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2011-09-24 20:50:35 +0000 |
| commit | d2c116058e72d365802eb5641be60a615daacb96 (patch) | |
| tree | 359b704504241d4828199b2179f31c5a36dff199 /daemons/clvmd/clvmd-command.c | |
| parent | a039e204e7263ba409218d4cc3fa407b12a111c1 (diff) | |
| download | lvm2-d2c116058e72d365802eb5641be60a615daacb96.tar.gz lvm2-d2c116058e72d365802eb5641be60a615daacb96.tar.xz lvm2-d2c116058e72d365802eb5641be60a615daacb96.zip | |
CLVMD support for LVM_CLVMD_BINARY and LVM_BINARY
Read 2 environmental vars to learn about overide position for
CLVMD and LVM binaries.
We support LVM_BINARY in other script - and this way we could easily
test restart in our test-suite.
Diffstat (limited to 'daemons/clvmd/clvmd-command.c')
| -rw-r--r-- | daemons/clvmd/clvmd-command.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c index 4ba71513..5857a30f 100644 --- a/daemons/clvmd/clvmd-command.c +++ b/daemons/clvmd/clvmd-command.c @@ -366,6 +366,7 @@ static int restart_clvmd(void) int argc = 0, max_locks = 0; struct dm_hash_node *hn = NULL; char debug_arg[16]; + const char *clvmd = getenv("LVM_CLVMD_BINARY") ? : CLVMD_PATH; DEBUGLOG("clvmd restart requested\n"); @@ -415,11 +416,11 @@ static int restart_clvmd(void) argv[argc] = NULL; /* Exec new clvmd */ - DEBUGLOG("--- Restarting %s ---\n", CLVMD_PATH); + DEBUGLOG("--- Restarting %s ---\n", clvmd); for (argc = 1; argv[argc]; argc++) DEBUGLOG("--- %d: %s\n", argc, argv[argc]); /* NOTE: This will fail when downgrading! */ - execve(CLVMD_PATH, (char **)argv, NULL); + execve(clvmd, (char **)argv, NULL); out: /* We failed */ DEBUGLOG("Restart of clvmd failed.\n"); |