From a3d34514ebc9856919c135f0460889cc609ffee2 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Thu, 12 Oct 2017 17:46:12 +0000
Subject: [PATCH] Update container/storage.conf and containers-storage.conf man
 page Default override to true so it is consistent with RHEL.

---
 ...age.conf.5.md => containers-storage.conf.5.md | 16 ++++++++++++++--
 skopeo.spec                                      |  8 ++++++--
 storage.conf                                     |  7 +++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 rename storage.conf.5.md => containers-storage.conf.5.md (70%)

diff --git a/storage.conf.5.md b/containers-storage.conf.5.md
similarity index 70%
rename from storage.conf.5.md
rename to containers-storage.conf.5.md
index 39a8fb7..429e42e 100644
--- a/storage.conf.5.md
+++ b/containers-storage.conf.5.md
@@ -28,7 +28,6 @@ No bare options are used. The format of TOML can be simplified to:
 
 The `storage` table supports the following options:
 
-
 **graphroot**=""
   container storage graph dir (default: "/var/lib/containers/storage")
   Default directory to store all writable content created by container storage programs
@@ -41,8 +40,21 @@ The `storage` table supports the following options:
   container storage driver (default is "overlay")
   Default Copy On Write (COW) container storage driver
 
+### STORAGE OPTIONS TABLE
+
+The `storage.options` table supports the following options:
+
 **additionalimagestores**=[]
-  Paths to additional congtainer image stores. Usually these are read/only and stored on remote network shares.
+  Paths to additional container image stores. Usually these are read/only and stored on remote network shares.
+
+**size**=""
+  Maximum size of a container image.  Default is 10GB.  This flag can be used to set quota
+  on the size of container images.
+
+**override_kernel_check**=""
+  Tell storage drivers to ignore kernel version checks.  Some storage drivers assume that if a kernel is too
+  old, the driver is not supported.  But for kernels that have had the drivers backported, this flag
+  allows users to override the checks
 
 # HISTORY
 May 2017, Originally compiled by Dan Walsh <dwalsh@redhat.com>
diff --git a/skopeo.spec b/skopeo.spec
index bd6d32e..5a06cae 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -38,13 +38,13 @@ Name:           %{repo}
 Epoch:          1
 %endif # centos
 Version:        0.1.24
-Release:        3.dev.git%{shortcommit0}%{?dist}
+Release:        4.dev.git%{shortcommit0}%{?dist}
 Summary:        Inspect Docker images and repositories on registries
 License:        ASL 2.0
 URL:            %{git0}
 Source0:        %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
 Source1:        storage.conf
-Source2:        storage.conf.5.md
+Source2:        containers-storage.conf.5.md
 
 %if 0%{?fedora}
 BuildRequires: go-srpm-macros
@@ -289,6 +289,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/bash-completion/completions/%{name}
 
 %changelog
+* Thu Oct 12 2017 dwalsh <dwalsh@redhat.com> - 0.1.24-4.dev.git28d4e08
+- Update container/storage.conf and containers-storage.conf man page
+- Default override to true so it is consistent with RHEL.
+
 * Tue Oct 10 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.1.24-3.dev.git28d4e08
 - built commit 28d4e08
 
diff --git a/storage.conf b/storage.conf
index 92cfd8a..0148a4c 100644
--- a/storage.conf
+++ b/storage.conf
@@ -19,3 +19,10 @@ graphroot = "/var/lib/containers/storage"
 # Must be comma separated list.
 additionalimagestores = [
 ]
+
+# Size is used to set a maximum size of the container image.  Only supported by
+# certain container storage drivers.
+size = ""
+
+# OverrideKernelCheck tells the driver to ignore kernel checks based on kernel version
+override_kernel_check = "true"