summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Stapelberg <stapelberg@debian.org>2013-08-15 07:57:30 (GMT)
committerPeter Rajnoha <prajnoha@redhat.com>2013-08-15 07:59:19 (GMT)
commit8cbbe851a80e8d99dc886ce9b44834137731d8ce (patch)
treef745eb6a204893c7c02fb97c0da1ccb5e3b43499
parentc29c64f20dadbd9076d8729bd3d0cb724c4b39b0 (diff)
downloadlvm2-8cbbe851a80e8d99dc886ce9b44834137731d8ce.zip
lvm2-8cbbe851a80e8d99dc886ce9b44834137731d8ce.tar.gz
lvm2-8cbbe851a80e8d99dc886ce9b44834137731d8ce.tar.xz
systemd: use LVM_PATH instead of hardcoded value in activation generator
-rw-r--r--WHATS_NEW1
-rw-r--r--scripts/lvm2_activation_generator_systemd_red_hat.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index 903b28d..a4df6c9 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.101 -
===================================
+ Use LVM_PATH instead of hardcoded value in lvm2 activation systemd generator.
Refresh existing VG before autoactivation (event retrigger/device reappeared).
Fix vgck to notice on-disk corruption even if lvmetad is used.
Move mpath device filter before partitioned filter (which opens devices).
diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c
index 17bc71a..9d4b581 100644
--- a/scripts/lvm2_activation_generator_systemd_red_hat.c
+++ b/scripts/lvm2_activation_generator_systemd_red_hat.c
@@ -22,6 +22,7 @@
#include <fcntl.h>
#include <limits.h> /* For PATH_MAX for musl libc */
#include "lvm2app.h"
+#include "configure.h" /* for LVM_PATH */
#define KMSG_DEV_PATH "/dev/kmsg"
#define LVM_CONF_USE_LVMETAD "global/use_lvmetad"
@@ -150,7 +151,7 @@ static int generate_unit(const char *dir, int unit)
"[Service]\n", f);
}
- fputs("ExecStart=/usr/sbin/lvm vgchange -aay --sysinit\n"
+ fputs("ExecStart=" LVM_PATH " vgchange -aay --sysinit\n"
"Type=oneshot\n", f);
if (fclose(f) < 0) {