Accepting request 198460 from Base:System

- Add lvm-path.patch: fix lvm binary path in systemd generator.
- Use %_tmpfilesdir macro for tmpfiles directory. (forwarded request 198442 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/198460
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=58

lvm-path.patch

@@ -0,0 +1,13 @@
+Index: LVM2.2.02.98/scripts/lvm2_activation_generator_systemd_red_hat.c
+===================================================================
+--- LVM2.2.02.98.orig/scripts/lvm2_activation_generator_systemd_red_hat.c
++++ LVM2.2.02.98/scripts/lvm2_activation_generator_systemd_red_hat.c
+@@ -125,7 +125,7 @@ static int generate_unit(const char *dir
+ 	fputs("Before=local-fs.target shutdown.target\n"
+ 	      "Wants=systemd-udev-settle.service\n\n"
+ 	      "[Service]\n"
+-	      "ExecStart=/usr/sbin/lvm vgchange -aay --sysinit\n"
++	      "ExecStart=/sbin/lvm vgchange -aay --sysinit\n"
+ 	      "Type=oneshot\n", f);
+ 
+ 	if (fclose(f) < 0) {

lvm2.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Sep 11 10:18:47 CEST 2013 - fcrozat@suse.com
+
+- Add lvm-path.patch: fix lvm binary path in systemd generator.
+- Use %_tmpfilesdir macro for tmpfiles directory.
+
+-------------------------------------------------------------------
+Sun Sep  8 22:20:46 UTC 2013 - crrodriguez@opensuse.org
+
+- Set all "run" directories relative to /run not just the "lock"
+  location
+- Install /usr/lib/tmpfiles.d/lvm2.conf as required to ensure
+  such runtime directories are _always_ there.
+
 -------------------------------------------------------------------
 Wed Aug 28 11:15:54 UTC 2013 - meissner@suse.com
 

lvm2.spec

@@ -61,6 +61,7 @@ Patch19:        dont_ignore_tmp_device_file.diff
 Patch20:        support-drbd-filter.diff
 Patch22:        handle_extended_devt.diff
 Patch66:        device-mapper-type_punning.diff
+Patch67:        lvm-path.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Not a real replacement but we drop evms
@@ -94,6 +95,7 @@ Volume Manager.
 %patch20 -p1
 %patch22 -p1
 %patch66 -p1
+%patch67 -p1
 
 %build
 #  set path so that thin_check can be found
@@ -107,10 +109,9 @@ PATH=$PATH:/sbin:/usr/sbin \
 	--enable-realtime --enable-pkgconfig \
 	--enable-selinux \
 	--with-clvmd=corosync --with-cluster=internal --with-cluster=internal \
-  --datarootdir=/usr/share --with-default-locking-dir=/run/lock/lvm \
-	--enable-cmirrord \
-  --with-thin=internal \
-	--enable-lvmetad
+    --datarootdir=/usr/share --with-default-locking-dir=/run/lock/lvm \
+	--enable-cmirrord --with-thin=internal --enable-lvmetad --with-default-pid-dir=/run \
+    --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm --with-tmpfilesdir=%{_tmpfilesdir}
 export SUSE_ASNEEDED=0
 make -j1 # symlinks are generated in parallel! %{?_smp_mflags}
 
@@ -119,6 +120,7 @@ make install_lvm2 DESTDIR=$RPM_BUILD_ROOT
 make install_system_dirs DESTDIR=$RPM_BUILD_ROOT
 make install_systemd_units DESTDIR=$RPM_BUILD_ROOT
 make install_systemd_generators DESTDIR=$RPM_BUILD_ROOT
+make install_tmpfiles_configuration DESTDIR=$RPM_BUILD_ROOT
 make -C liblvm install DESTDIR=$RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT/etc/lvm
 install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/backup
@@ -171,7 +173,6 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/dm*
 #remove device-mapper systemd events
 rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.socket
 rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.service
-
 # install and collect_lvm
 #install -m755 -D %{S:7} $RPM_BUILD_ROOT%{_udevdir}/collect_lvm
 
@@ -205,6 +206,7 @@ rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.service
 %{_unitdir}/lvm2-monitor.service
 %{_unitdir}/lvm2-lvmetad.socket
 %{_unitdir}/lvm2-lvmetad.service
+%{_tmpfilesdir}/lvm2.conf
 #%{_udevdir}/collect_lvm
 /lib/mkinitrd/scripts/setup-lvm2.sh
 /lib/mkinitrd/scripts/boot-lvm2.sh