* [PATCH] udev: Do not override SYSTEMD_WANTS environment variable
@ 2015-08-11 7:44 Thomas Bächler
2015-08-12 7:35 ` Peter Rajnoha
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Bächler @ 2015-08-11 7:44 UTC (permalink / raw)
To: lvm-devel
Instead of using = to override SYSTEMD_WANTS, use += to add the pvscan service.
---
udev/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/udev/Makefile.in b/udev/Makefile.in
index 390069b..c4cc2bd 100644
--- a/udev/Makefile.in
+++ b/udev/Makefile.in
@@ -47,7 +47,7 @@ BLKID_RULE=IMPORT{program}=\"${SBIN}\/blkid -o udev -p \$$tempnode\"
endif
ifeq ("@UDEV_SYSTEMD_BACKGROUND_JOBS@", "yes")
-PVSCAN_RULE=ACTION\!=\"remove\", ENV{LVM_PV_GONE}==\"1\", RUN\+=\"@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\", GOTO=\"lvm_end\"\nENV{SYSTEMD_ALIAS}=\"\/dev\/block\/\$$major:\$$minor\"\nENV{ID_MODEL}=\"LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\"\nENV{SYSTEMD_WANTS}=\"lvm2-pvscan@\$$major:\$$minor.service\"
+PVSCAN_RULE=ACTION\!=\"remove\", ENV{LVM_PV_GONE}==\"1\", RUN\+=\"@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\", GOTO=\"lvm_end\"\nENV{SYSTEMD_ALIAS}=\"\/dev\/block\/\$$major:\$$minor\"\nENV{ID_MODEL}=\"LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\"\nENV{SYSTEMD_WANTS}+=\"lvm2-pvscan@\$$major:\$$minor.service\"
else
PVSCAN_RULE=RUN\+\=\"$(LVM_EXEC)/lvm pvscan --background --cache --activate ay --major \$$major --minor \$$minor\", ENV{LVM_SCANNED}=\"1\"
endif
--
2.4.6
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] udev: Do not override SYSTEMD_WANTS environment variable
2015-08-11 7:44 [PATCH] udev: Do not override SYSTEMD_WANTS environment variable Thomas Bächler
@ 2015-08-12 7:35 ` Peter Rajnoha
0 siblings, 0 replies; 2+ messages in thread
From: Peter Rajnoha @ 2015-08-12 7:35 UTC (permalink / raw)
To: lvm-devel
On 08/11/2015 09:44 AM, Thomas B?chler wrote:
> Instead of using = to override SYSTEMD_WANTS, use += to add the pvscan service.
> ---
> udev/Makefile.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/udev/Makefile.in b/udev/Makefile.in
> index 390069b..c4cc2bd 100644
> --- a/udev/Makefile.in
> +++ b/udev/Makefile.in
> @@ -47,7 +47,7 @@ BLKID_RULE=IMPORT{program}=\"${SBIN}\/blkid -o udev -p \$$tempnode\"
> endif
>
> ifeq ("@UDEV_SYSTEMD_BACKGROUND_JOBS@", "yes")
> -PVSCAN_RULE=ACTION\!=\"remove\", ENV{LVM_PV_GONE}==\"1\", RUN\+=\"@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\", GOTO=\"lvm_end\"\nENV{SYSTEMD_ALIAS}=\"\/dev\/block\/\$$major:\$$minor\"\nENV{ID_MODEL}=\"LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\"\nENV{SYSTEMD_WANTS}=\"lvm2-pvscan@\$$major:\$$minor.service\"
> +PVSCAN_RULE=ACTION\!=\"remove\", ENV{LVM_PV_GONE}==\"1\", RUN\+=\"@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\", GOTO=\"lvm_end\"\nENV{SYSTEMD_ALIAS}=\"\/dev\/block\/\$$major:\$$minor\"\nENV{ID_MODEL}=\"LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\"\nENV{SYSTEMD_WANTS}+=\"lvm2-pvscan@\$$major:\$$minor.service\"
> else
> PVSCAN_RULE=RUN\+\=\"$(LVM_EXEC)/lvm pvscan --background --cache --activate ay --major \$$major --minor \$$minor\", ENV{LVM_SCANNED}=\"1\"
> endif
>
Nice catch! Applied. Thanks!
https://git.fedorahosted.org/cgit/lvm2.git/commit/?id=3ea396e9d220cec55fd4e139be7ae486cb4ddb91
--
Peter
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-12 7:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-11 7:44 [PATCH] udev: Do not override SYSTEMD_WANTS environment variable Thomas Bächler
2015-08-12 7:35 ` Peter Rajnoha
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.