From 27538a06e758437961a81168ddfafa148fa6fb1a657fb0925a931c03faabd3ba Mon Sep 17 00:00:00 2001 From: dong mao zhang Date: Wed, 11 Sep 2013 07:48:52 +0000 Subject: [PATCH 1/2] Accepting request 197944 from home:elvigia:branches:Base:System - 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. OBS-URL: https://build.opensuse.org/request/show/197944 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=68 --- lvm2.changes | 8 ++++++++ lvm2.spec | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lvm2.changes b/lvm2.changes index 29c5e50..7815baf 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/lvm2.spec b/lvm2.spec index 901449d..2e31668 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -107,10 +107,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=%{_prefix}/lib/tmpfiles.d export SUSE_ASNEEDED=0 make -j1 # symlinks are generated in parallel! %{?_smp_mflags} @@ -119,6 +118,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 +171,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 +204,7 @@ rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.service %{_unitdir}/lvm2-monitor.service %{_unitdir}/lvm2-lvmetad.socket %{_unitdir}/lvm2-lvmetad.service +%{_prefix}/lib/tmpfiles.d/lvm2.conf #%{_udevdir}/collect_lvm /lib/mkinitrd/scripts/setup-lvm2.sh /lib/mkinitrd/scripts/boot-lvm2.sh From 0d189f3052ac91312a4d628f11751144eacf04c2406ea6420eb0213116839b81 Mon Sep 17 00:00:00 2001 From: dong mao zhang Date: Wed, 11 Sep 2013 09:38:23 +0000 Subject: [PATCH 2/2] Accepting request 198442 from home:fcrozat:branches:Base:System - Add lvm-path.patch: fix lvm binary path in systemd generator. - Use %_tmpfilesdir macro for tmpfiles directory. OBS-URL: https://build.opensuse.org/request/show/198442 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=69 --- lvm-path.patch | 13 +++++++++++++ lvm2.changes | 6 ++++++ lvm2.spec | 6 ++++-- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 lvm-path.patch diff --git a/lvm-path.patch b/lvm-path.patch new file mode 100644 index 0000000..8a4d31a --- /dev/null +++ b/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) { diff --git a/lvm2.changes b/lvm2.changes index 7815baf..3b0a6dd 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/lvm2.spec b/lvm2.spec index 2e31668..4a5584f 100644 --- a/lvm2.spec +++ b/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 @@ -109,7 +111,7 @@ PATH=$PATH:/sbin:/usr/sbin \ --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 --with-default-pid-dir=/run \ - --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm --with-tmpfilesdir=%{_prefix}/lib/tmpfiles.d + --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} @@ -204,7 +206,7 @@ rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.service %{_unitdir}/lvm2-monitor.service %{_unitdir}/lvm2-lvmetad.socket %{_unitdir}/lvm2-lvmetad.service -%{_prefix}/lib/tmpfiles.d/lvm2.conf +%{_tmpfilesdir}/lvm2.conf #%{_udevdir}/collect_lvm /lib/mkinitrd/scripts/setup-lvm2.sh /lib/mkinitrd/scripts/boot-lvm2.sh