diff options
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | scripts/lvm2_pvscan_systemd_red_hat@.service.in | 11 | ||||
| -rw-r--r-- | udev/Makefile.in | 4 |
3 files changed, 11 insertions, 5 deletions
@@ -1,5 +1,6 @@ Version 2.02.104 =================================== + Add dev-block-<major>:<minor>.device systemd alias for complete PV tracking. Use major:minor as short form of --major and --minor arg for pvscan --cache. Remove 2>/dev/null from three lvm commands executed by vgimportclone. Add configure --enable-udev-systemd-background-jobs. diff --git a/scripts/lvm2_pvscan_systemd_red_hat@.service.in b/scripts/lvm2_pvscan_systemd_red_hat@.service.in index 9d91b5ecb..07ea5caca 100644 --- a/scripts/lvm2_pvscan_systemd_red_hat@.service.in +++ b/scripts/lvm2_pvscan_systemd_red_hat@.service.in @@ -1,11 +1,14 @@ [Unit] -Description=LVM2 PV scan on %I +Description=LVM2 PV scan on device %i Documentation=man:pvscan(8) DefaultDependencies=no -After=lvm2-lvmetad.socket %i.device +BindsTo=dev-block-%i.device +After=lvm2-lvmetad.socket Before=shutdown.target Conflicts=shutdown.target [Service] -Type=simple -ExecStart=@sbindir@/pvscan --cache --activate ay %I +Type=oneshot +RemainAfterExit=yes +ExecStart=@sbindir@/pvscan --cache --activate ay /dev/block/%i +ExecStop=/usr/sbin/pvscan --cache %i diff --git a/udev/Makefile.in b/udev/Makefile.in index fdf43df5e..8f0dc8a78 100644 --- a/udev/Makefile.in +++ b/udev/Makefile.in @@ -47,7 +47,9 @@ BLKID_RULE=IMPORT{program}=\"${SBIN}\/blkid -o udev -p \$$tempnode\" endif ifeq ("@UDEV_SYSTEMD_BACKGROUND_JOBS@", "yes") -PVSCAN_RULE=ENV{SYSTEMD_WANTS}=\"lvm2-pvscan@\$$devnode.service\" +PVSCAN_RULE="ENV{SYSTEMD_ALIAS}=\"/dev/block/$$major:$$minor\" \ + ENV{ID_MODEL}=\"LVM PV $$env{ID_FS_UUID_ENC} on /dev/$$name\" \ + ENV{SYSTEMD_WANTS}=\"lvm2-pvscan@\$$devnode.service\"" else PVSCAN_RULE=RUN\+\=\"$(LVM_EXEC)/lvm pvscan --background --cache --activate ay --major \$$major --minor \$$minor\", ENV{LVM_SCANNED}=\"1\" endif |