1
0
Dominique Leuenberger 2020-06-23 19:03:10 +00:00 committed by Git OBS Bridge
parent 3fa981dda6
commit 3dba97707e
3 changed files with 11 additions and 9 deletions

View File

@ -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>

View File

@ -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

View File

@ -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