04ddaa4bc5
add cmirror version OBS-URL: https://build.opensuse.org/request/show/236202 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=96
26 lines
957 B
Diff
26 lines
957 B
Diff
Index: LVM2.2.02.98/scripts/lvm2_activation_generator_systemd_red_hat.c
|
|
===================================================================
|
|
--- LVM2.2.02.98.orig/scripts/lvm2_activation_generator_systemd_red_hat.c 2014-04-14 14:25:29.280756835 +0800
|
|
+++ LVM2.2.02.98/scripts/lvm2_activation_generator_systemd_red_hat.c 2014-04-14 14:27:19.894797719 +0800
|
|
@@ -154,17 +154,16 @@ int main(int argc, char *argv[])
|
|
}
|
|
|
|
/* If lvmetad used, rely on autoactivation instead of direct activation. */
|
|
- if (lvm_uses_lvmetad()) {
|
|
- kmsg("LVM: Logical Volume autoactivation enabled.\n");
|
|
+ if (lvm_uses_lvmetad())
|
|
goto out;
|
|
- }
|
|
|
|
dir = argc > 1 ? argv[1] : DEFAULT_UNIT_DIR;
|
|
|
|
if (!generate_unit(dir, 1) || !generate_unit(dir, 0))
|
|
r = EXIT_FAILURE;
|
|
out:
|
|
- kmsg("LVM: Activation generator %s.\n", r ? "failed" : "successfully completed");
|
|
+ if (r)
|
|
+ kmsg("LVM: Activation generator failed.\n");
|
|
if (kmsg_fd != -1)
|
|
(void) close(kmsg_fd);
|
|
return r;
|