diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2015-01-26 17:47:29 +0100 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2015-01-26 17:55:36 +0100 |
| commit | f03eff08f7388dfcfff1aae91a7b2d4f649dadeb (patch) | |
| tree | 2c6af7aa5e6fc989ac8974f77837ccf1119f13a7 | |
| parent | 79e031b56eb0b8fb84e55f7a010d0a45be56cf4c (diff) | |
LVM2: Spawn the helper command with the correct pathmodule-lvm2
| -rw-r--r-- | modules/lvm2/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/lvm2/udiskslinuxvolumegroupobject.c | 4 | ||||
| -rw-r--r-- | modules/lvm2/udiskslvm2moduleiface.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/modules/lvm2/Makefile.am b/modules/lvm2/Makefile.am index 61db3ed..2dc4f91 100644 --- a/modules/lvm2/Makefile.am +++ b/modules/lvm2/Makefile.am @@ -13,6 +13,7 @@ INCLUDES = \ -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ + -DLVM_HELPER_DIR=\""$(prefix)/lib/udisks2/"\" \ -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -DUDISKS_COMPILATION \ $(POLKIT_GOBJECT_1_CFLAGS) \ diff --git a/modules/lvm2/udiskslinuxvolumegroupobject.c b/modules/lvm2/udiskslinuxvolumegroupobject.c index 3d83371..7ba9f90 100644 --- a/modules/lvm2/udiskslinuxvolumegroupobject.c +++ b/modules/lvm2/udiskslinuxvolumegroupobject.c @@ -549,7 +549,7 @@ update_with_variant (GPid pid, void udisks_linux_volume_group_object_update (UDisksLinuxVolumeGroupObject *object) { - const gchar *args[] = { PACKAGE_LIB_DIR "/udisks2/udisks-lvm", "-b", "show", object->name, NULL }; + const gchar *args[] = { LVM_HELPER_DIR "udisks-lvm", "-b", "show", object->name, NULL }; udisks_daemon_util_lvm2_spawn_for_variant (args, G_VARIANT_TYPE("a{sv}"), update_with_variant, g_object_ref (object)); } @@ -641,7 +641,7 @@ poll_timeout (gpointer user_data) static void poll_now (UDisksLinuxVolumeGroupObject *object) { - const gchar *args[] = { PACKAGE_LIB_DIR "/udisks2/udisks-lvm", "-b", "show", object->name, NULL }; + const gchar *args[] = { LVM_HELPER_DIR "udisks-lvm", "-b", "show", object->name, NULL }; object->poll_timeout_id = g_timeout_add (5000, poll_timeout, g_object_ref (object)); diff --git a/modules/lvm2/udiskslvm2moduleiface.c b/modules/lvm2/udiskslvm2moduleiface.c index f7570cc..a8e1926 100644 --- a/modules/lvm2/udiskslvm2moduleiface.c +++ b/modules/lvm2/udiskslvm2moduleiface.c @@ -165,7 +165,7 @@ lvm_update (UDisksDaemon *daemon, gboolean ignore_locks) int i; i = 0; - args[i++] = PACKAGE_LIB_DIR "/udisks2/udisks-lvm"; + args[i++] = LVM_HELPER_DIR "udisks-lvm"; args[i++] = "-b"; if (ignore_locks) args[i++] = "-f"; |