Accepting request 570555 from home:kiall:branches:devel:CaaSP:Head:ControllerNode

- Use full/absolute path for mksubvolume
- Change snapper Requires to a Requires(post)

OBS-URL: https://build.opensuse.org/request/show/570555
OBS-URL: https://build.opensuse.org/package/show/devel:CaaSP:Head:ControllerNode/cni?expand=0&rev=5
This commit is contained in:
Jordi Massaguer 2018-01-31 11:14:02 +00:00 committed by Git OBS Bridge
parent 4e915df5e7
commit 9f25d69057
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 29 11:12:16 UTC 2018 - kmacinnes@suse.com
- Use full/absolute path for mksubvolume
- Change snapper Requires to a Requires(post)
-------------------------------------------------------------------
Thu Jan 18 14:46:16 UTC 2018 - kmacinnes@suse.com

View File

@ -29,7 +29,7 @@ Url: https://github.com/containernetworking/cni
Source: %{name}-%{version}.tar.xz
Source1: 99-loopback.conf
%if 0%{?is_susecaasp}
Requires: snapper
Requires(post): snapper
%endif
BuildRequires: golang-packaging
BuildRequires: shadow
@ -81,7 +81,7 @@ cp CONTRIBUTING.md README.md LICENSE DCO %{buildroot}%{cni_doc_dir}/
# create a (writable) state dir for plugins
%if 0%{?is_susecaasp}
test -e /var/lib/cni || mksubvolume /var/lib/cni
test -e /var/lib/cni || /usr/sbin/mksubvolume /var/lib/cni
%else
mkdir -p /var/lib/cni
%endif