From 1d00e50bf84f78c5ae8dbd4020fe0d9d64f06291 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Dec 22 2016 14:47:20 +0000 Subject: Switch locate to /var/lib/containers for images --- diff --git a/ocid.spec b/ocid.spec index fab71d4..708fd10 100644 --- a/ocid.spec +++ b/ocid.spec @@ -35,7 +35,7 @@ Name: ocid Version: 0 -Release: 0.6.git%{shortcommit0}%{?dist} +Release: 0.7.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -63,6 +63,7 @@ BuildRequires: device-mapper-devel Requires(pre): container-selinux Requires: runc >= 1.0.0-1.rc2 Provides: %{repo} = %{version}-%{release} +Provides: cri-o %description %{summary} @@ -473,12 +474,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif -%{buildroot}%{_bindir}/%{name} --conmon %{_libexecdir}/%{name}/conmon --listen \ -%{_localstatedir}/run/%{name}.sock --runtime %{_bindir}/runc --root %{_sharedstatedir}/containers/%{name} \ ---runroot %{_localstatedir}/run/containers/%{name} --seccomp-profile \ -%{_sysconfdir}/%{name}/seccomp.json --cni-config-dir \ -%{_sysconfdir}/cni/net.d --storage-driver=devmapper config > \ + %{buildroot}%{_bindir}/%{name} --root %{_sharedstatedir}/containers \ +--storage-driver=devmapper config > \ %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +mkdir %{buildroot}%{_sharedstatedir}/containers %preun %systemd_preun %{name} @@ -521,9 +520,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %dir %{_libexecdir}/%{name}/cni %{_libexecdir}/%{name}/cni/* %{_unitdir}/%{name}.service - +%dir %{_sharedstatedir}/containers %changelog +* Thu Dec 22 2016 Dan Walsh - 0-0.7.git2e6070f +- Switch locate to /var/lib/containers for images + * Thu Dec 22 2016 Lokesh Mandvekar - 0-0.6.git2e6070f - built commit 2e6070f