1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

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

Thanks to Alexander Tsoy for the original patch (modified a bit here):
https://www.redhat.com/archives/lvm-devel/2013-September/msg00049.html
This commit is contained in:
Peter Rajnoha 2013-09-16 11:47:09 +02:00
parent fbb732bd8e
commit 9742c5192e
2 changed files with 6 additions and 5 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.101 -
===================================
Run lvm2-activation-net after lvm2-activation service to prevent parallel run.
Add man page entries for lvmdump's -u and -l options.
Fix lvm2app segfault while using lvm_list_pvs_free fn if there are no PVs.
Improve of clvmd singlenode locking simulation.

View File

@ -134,16 +134,16 @@ 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"