master - systemd: depend on systemd-udev-settle unit in activation unit

[Zdenek Kabelac <zkabelac@redhat.com>]

Dne 12.9.2012 11:37, Peter Rajnoha napsal(a):
> Gitweb:        http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6d75ff138cb1614ee5e31bbd0c3c25721ff9514c
> Commit:        6d75ff138cb1614ee5e31bbd0c3c25721ff9514c
> Parent:        31271606265ec8f7c14734aedbb0a314dfea2cd1
> Author:        Peter Rajnoha <prajnoha@redhat.com>
> AuthorDate:    Wed Sep 12 11:30:13 2012 +0200
> Committer:     Peter Rajnoha <prajnoha@redhat.com>
> CommitterDate: Wed Sep 12 11:30:13 2012 +0200
>
> systemd: depend on systemd-udev-settle unit in activation unit
>
> The "fedora-wait-storage.service" that the "lvm2-activation.service"
> had as a dependency (which was fedora-specific solution anyway)
> is obsolete now as this unit called "modprobe scsi_wait_scan"
> which is not used anymore.
>
> The "fedora-wait-storage.service" had "systemd-udev-settle" as
> its dependency, so let's depend on this one directly now,
> bypassing the out-dated "fedora-wait-storage.service".
> ---
>   WHATS_NEW                                          |    1 +
>   .../lvm2_activation_generator_systemd_red_hat.c    |    4 ++--
>   2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/WHATS_NEW b/WHATS_NEW
> index 4884626..2b897e8 100644
> --- a/WHATS_NEW
> +++ b/WHATS_NEW
> @@ -1,5 +1,6 @@
>   Version 2.02.98 -
>   =================================
> +  Depend on systemd-udev-settle in units generated by activation generator.
>     Fix vgchange -aay to activate proper logical volumes.
>     Properly handle 'resync' of RAID LVs.
>     Disallow addition of RAID images until the array is in-sync.
> diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c
> index 9fcee20..786d795 100644
> --- a/scripts/lvm2_activation_generator_systemd_red_hat.c
> +++ b/scripts/lvm2_activation_generator_systemd_red_hat.c
> @@ -116,12 +116,12 @@ static int generate_unit(const char *dir, int early)
>   	      "DefaultDependencies=no\n", f);
>
>   	if (early)
> -		fputs("After=fedora-wait-storage.service\n", f);
> +		fputs("After=systemd-udev-settle.service\n", f);
>   	else
>   		fputs("After=lvm2-activation-early.service cryptsetup.target\n", f);
>
>   	fputs("Before=local-fs.target shutdown.target\n"
> -	      "Wants=fedora-wait-storage.service\n\n"
> +	      "Wants=systemd-udev-settle.service\n\n"
>   	      "[Service]\n"
>   	      "ExecStart=/usr/sbin/lvm vgchange -aay --sysinit\n"
>   	      "Type=oneshot\n", f);
>


I think we need here some backward compatible cross-distro solution.

Zdenek