From adbc1611ca5904e3ffbe7d972b8b818917d7ad69adf87d131e5595dc11fe102c Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Mon, 29 Mar 2021 16:21:19 +0000
Subject: [PATCH] Accepting request 880685 from devel:kubic

- Reintroduce SLE specific mounts config, to avoid errors on non-SLE systems

OBS-URL: https://build.opensuse.org/request/show/880685
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcontainers-common?expand=0&rev=33
---
 libcontainers-common.changes | 5 +++++
 libcontainers-common.spec    | 9 +++++++++
 mounts.conf                  | 2 --
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/libcontainers-common.changes b/libcontainers-common.changes
index 21a40cb..06ce9d6 100644
--- a/libcontainers-common.changes
+++ b/libcontainers-common.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 23 09:39:45 UTC 2021 - Richard Brown <rbrown@suse.com>
+
+- Reintroduce SLE specific mounts config, to avoid errors on non-SLE systems 
+
 -------------------------------------------------------------------
 Thu Mar  4 18:14:43 UTC 2021 - Richard Brown <rbrown@suse.com>
 
diff --git a/libcontainers-common.spec b/libcontainers-common.spec
index 2c8c295..f82b36f 100644
--- a/libcontainers-common.spec
+++ b/libcontainers-common.spec
@@ -91,6 +91,15 @@ go-md2man -in docs/source/markdown/containers-mounts.conf.5.md -out docs/source/
 go-md2man -in pkg/hooks/docs/oci-hooks.5.md -out pkg/hooks/docs/oci-hooks.5
 cd ..
 
+%if 0%{?is_opensuse}
+# no default mounts
+%else
+cat >>%{SOURCE5} <<EOL
+/etc/SUSEConnect:/etc/SUSEConnect
+/etc/zypp/credentials.d/SCCcredentials:/etc/zypp/credentials.d/SCCcredentials
+EOL
+%endif
+
 cd common-%{commonver}
 make docs
 cd ..
diff --git a/mounts.conf b/mounts.conf
index 73c2735..8b1f7aa 100644
--- a/mounts.conf
+++ b/mounts.conf
@@ -1,5 +1,3 @@
 # This configuration file specifies the default mounts for each container of the
 # tools adhering to this file (e.g., CRI-O, Podman, Buildah).  The format of the
 # config is /SRC:/DST, one mount per line.
-/etc/SUSEConnect:/etc/SUSEConnect
-/etc/zypp/credentials.d/SCCcredentials:/etc/zypp/credentials.d/SCCcredentials