From 3dba97707e56857e80ffe8e7c9d6c4e328b3e0e7d4284b7bfd8b294ff9e9910d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Tue, 23 Jun 2020 19:03:10 +0000
Subject: [PATCH] Accepting request 815925 from devel:kubic

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

diff --git a/libcontainers-common.changes b/libcontainers-common.changes
index f464f83..d36bf26 100644
--- a/libcontainers-common.changes
+++ b/libcontainers-common.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jun 19 09:57:44 UTC 2020 - Ralf Haferkamp <rhafer@suse.com>
+
+- Remove remaining difference between SLE and openSUSE package and
+  ship the some mounts.conf default configuration on both platforms.
+  As the sources for the mount point do not exist on openSUSE by
+  default this config will basically have no effect on openSUSE.
+  (jsc#SLE-12122)
+
 -------------------------------------------------------------------
 Wed Jun  3 14:37:20 UTC 2020 - Ralf Haferkamp <rhafer@suse.com>
 
diff --git a/libcontainers-common.spec b/libcontainers-common.spec
index f6ff6ca..a7eecb0 100644
--- a/libcontainers-common.spec
+++ b/libcontainers-common.spec
@@ -88,15 +88,6 @@ 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
-
 %install
 cd ..
 install -d -m 0755 %{buildroot}/%{_sysconfdir}/containers
diff --git a/mounts.conf b/mounts.conf
index 8b1f7aa..73c2735 100644
--- a/mounts.conf
+++ b/mounts.conf
@@ -1,3 +1,5 @@
 # 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