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
This commit is contained in:
dong mao zhang 2013-09-11 07:48:52 +00:00 committed by Git OBS Bridge
parent 0a7be8e2a6
commit 27538a06e7
2 changed files with 13 additions and 5 deletions

View File

@ -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 Wed Aug 28 11:15:54 UTC 2013 - meissner@suse.com

View File

@ -108,9 +108,8 @@ PATH=$PATH:/sbin:/usr/sbin \
--enable-selinux \ --enable-selinux \
--with-clvmd=corosync --with-cluster=internal --with-cluster=internal \ --with-clvmd=corosync --with-cluster=internal --with-cluster=internal \
--datarootdir=/usr/share --with-default-locking-dir=/run/lock/lvm \ --datarootdir=/usr/share --with-default-locking-dir=/run/lock/lvm \
--enable-cmirrord \ --enable-cmirrord --with-thin=internal --enable-lvmetad --with-default-pid-dir=/run \
--with-thin=internal \ --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm --with-tmpfilesdir=%{_prefix}/lib/tmpfiles.d
--enable-lvmetad
export SUSE_ASNEEDED=0 export SUSE_ASNEEDED=0
make -j1 # symlinks are generated in parallel! %{?_smp_mflags} 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_system_dirs DESTDIR=$RPM_BUILD_ROOT
make install_systemd_units DESTDIR=$RPM_BUILD_ROOT make install_systemd_units DESTDIR=$RPM_BUILD_ROOT
make install_systemd_generators 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 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
install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/backup 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 #remove device-mapper systemd events
rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.socket rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.socket
rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.service rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.service
# install and collect_lvm # install and collect_lvm
#install -m755 -D %{S:7} $RPM_BUILD_ROOT%{_udevdir}/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-monitor.service
%{_unitdir}/lvm2-lvmetad.socket %{_unitdir}/lvm2-lvmetad.socket
%{_unitdir}/lvm2-lvmetad.service %{_unitdir}/lvm2-lvmetad.service
%{_prefix}/lib/tmpfiles.d/lvm2.conf
#%{_udevdir}/collect_lvm #%{_udevdir}/collect_lvm
/lib/mkinitrd/scripts/setup-lvm2.sh /lib/mkinitrd/scripts/setup-lvm2.sh
/lib/mkinitrd/scripts/boot-lvm2.sh /lib/mkinitrd/scripts/boot-lvm2.sh