File systemd-run-lvm2-activation-net.service-after-lvm2-activation.service.patch of Package lvm2.1005

From 76b878371f62a7ca409835bdea2472524be139b8 Mon Sep 17 00:00:00 2001
From: Liuhua Wang <lwang@suse.com>
Date: Mon, 28 Sep 2015 16:20:30 +0800
Subject: [PATCH] systemd: run lvm2-activation-net.service after
 lvm2-activation.service

The lvm2-activation-net.service was ordered only with respect to iscsi
and fcoe service before. In addition to that, we also need ordering
with respect to lvm2-activation.service to prevent parallel vgchange -aay
runs which may cause some problems during activation.
See also https://bugs.gentoo.org/show_bug.cgi?id=480066.

With this patch, the ordering is firmly set to:
lvm2-activation-early.service -> lvm2-activation.service -> lvm2-activation-net.service

References: bnc#946651
Commit: 9742c5192e8871ebde12856170dae70ee861ef40
---
 scripts/lvm2_activation_generator_systemd_red_hat.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c
index 5eacd4f..061f2b1 100644
--- a/scripts/lvm2_activation_generator_systemd_red_hat.c
+++ b/scripts/lvm2_activation_generator_systemd_red_hat.c
@@ -129,16 +129,17 @@ static int generate_unit(const char *dir, int unit)
 	      "DefaultDependencies=no\n", f);
 
    if (unit == UNIT_NET) {
-       fputs("After=iscsi.service fcoe.service\n"
-             "Before=remote-fs.target shutdown.target\n\n"
-             "[Service]\n"
-             "ExecStartPre=/usr/bin/udevadm settle\n", f);
+       fprintf(f, "After=%s iscsi.service fcoe.service\n"
+           "Before=remote-fs.target shutdown.target\n\n"
+           "[Service]\n"
+           "ExecStartPre=/usr/bin/udevadm settle\n", unit_names[UNIT_MAIN]);
+
    } else {
        if (unit == UNIT_EARLY) {
            fputs("After=systemd-udev-settle.service\n"
                  "Before=cryptsetup.target\n", f);
        } else
-           fputs("After=lvm2-activation-early.service cryptsetup.target\n", f);
+           fprintf(f, "After= %s cryptsetup.target\n", unit_names[UNIT_EARLY]);
 
        fputs("Before=local-fs.target shutdown.target\n"
              "Wants=systemd-udev-settle.service\n\n"
-- 
1.8.4.5