From 152d5106b862571c036eae1087c48f82c33a38a8 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 20 2020 14:54:17 +0000
Subject: import vdo-6.1.3.23-5.el7


---

diff --git a/.gitignore b/.gitignore
index a8c8c88..10c7f91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/vdo-741031a.tar.gz
+SOURCES/vdo-1cacc67.tar.gz
diff --git a/.vdo.metadata b/.vdo.metadata
index 799287c..c3d8f9f 100644
--- a/.vdo.metadata
+++ b/.vdo.metadata
@@ -1 +1 @@
-4ff204aa8697c243461a866a4501d0b879f40269 SOURCES/vdo-741031a.tar.gz
+411a9450a2b03e761c144025676949c2074114c1 SOURCES/vdo-1cacc67.tar.gz
diff --git a/SPECS/vdo.spec b/SPECS/vdo.spec
index 044bc34..09e0fef 100644
--- a/SPECS/vdo.spec
+++ b/SPECS/vdo.spec
@@ -1,7 +1,7 @@
-%global commit       741031af4b5ab1d03bb2a9206fb9e6c69790d13b
-%global gittag       6.1.3.4
+%global commit       1cacc67b2578475e092c829cbfd4235ab6ed480c
+%global gittag       6.1.3.23
 %global shortcommit  %(c=%{commit}; echo ${c:0:7})
-%define spec_release 4
+%define spec_release 5
 #
 #
 #
@@ -59,6 +59,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALLOWNER= bindir=%{_bindir} \
 
 %post
 %systemd_post vdo.service
+%systemd_post blk-availability.service
 
 %preun
 %systemd_preun vdo.service
@@ -69,6 +70,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALLOWNER= bindir=%{_bindir} \
 %files
 #defattr(-,root,root)
 %{_bindir}/vdo
+%{_bindir}/vdo-by-dev
 %{_bindir}/vdodmeventd
 %{_bindir}/vdodumpconfig
 %{_bindir}/vdoforcerebuild
@@ -174,7 +176,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALLOWNER= bindir=%{_bindir} \
 %{python_sitelib}/%{name}/utils/__init__.pyc
 %{python_sitelib}/%{name}/utils/__init__.pyo
 %{_unitdir}/vdo.service
+%{_unitdir}/vdo-start-by-dev@.service
 %{_presetdir}/97-vdo.preset
+%{_sysconfdir}/udev/rules.d/69-vdo-start-by-dev.rules
 %dir %{_defaultdocdir}/%{name}
 %license %{_defaultdocdir}/%{name}/COPYING
 %dir %{_defaultdocdir}/%{name}/examples
@@ -197,6 +201,10 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALLOWNER= bindir=%{_bindir} \
 %{_mandir}/man8/vdostats.8.gz
 
 %changelog
+* Thu Apr 09 2020 - Andy Walsh <awalsh@redhat.com> - 6.1.3.23-5
+- Updated systemd integration to allow more flexible startup configuration.
+- Resolves: rhbz#1706154
+
 * Tue Aug 20 2019 - Andy Walsh <awalsh@redhat.com> - 6.1.3.4-4
 - Added UUID filtering of underlying devices when running vdo create with
   the --force flag as this failed when run on certain PVs.