pool/libcontainers-common
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1072110 from devel:microos

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1072110
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcontainers-common?expand=0&rev=58
This commit is contained in:
Dominique Leuenberger 2023-03-17 16:02:19 +00:00 committed by Git OBS Bridge
commit 303b38cf06
3 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
container-storage-driver.sh
View File

@ -1,11 +0,0 @@
if test "$(id -u)" -gt "0" && test -d "$HOME"; then
if test ! -e "$HOME"/.config/containers/storage.conf && \
test ! -e "$HOME"/.local/share/containers/storage/libpod && \
grep -qx "driver = .*btrfs.*" /etc/containers/storage.conf ; then
if test "$(findmnt -o FSTYPE -l --target "$HOME" | grep -v FSTYPE)" != "btrfs"; then
# Home partition is not btrfs, but system wide setting is to use btrfs, this won't work
# default to 'overlay' then
export STORAGE_DRIVER=overlay
fi
fi
fi

17
libcontainers-common.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Mar 15 09:17:51 UTC 2023 - Dan Čermák <dcermak@suse.com>
- Remove container-storage-driver.sh, we want to default to the overlay driver
instead of btrfs.
The btrfs driver is not really supported upstream (see
e.g. https://github.com/containers/podman/issues/16882), there is no real
development anymore and it appears to have subtle bugs (e.g. the one linked
previously).
To prevent further such issues, we will from now on default to the overlay
driver.
-------------------------------------------------------------------
Wed Mar 15 08:55:24 UTC 2023 - Dan Čermák <dcermak@suse.com>
- Remove obsolete Requires(post): util-linux-systemd
-------------------------------------------------------------------
Mon Feb 27 10:30:12 UTC 2023 - Dan Čermák <dcermak@suse.com>

25
libcontainers-common.spec
View File

@ -51,12 +51,9 @@ Source8: common-%{commonver}.tar.xz
Source9: containers.conf
Source10: %{name}.rpmlintrc
Source11: https://raw.githubusercontent.com/containers/shortnames/v%{shortnamesver}/shortnames.conf
Source12: container-storage-driver.sh
BuildRequires: go-go-md2man
Requires: util-linux-systemd
Requires(post): %{_bindir}/grep
Requires(post): %{_bindir}/sed
Requires(post): util-linux-systemd
Provides: libcontainers-image = %{version}
Provides: libcontainers-storage = %{version}
Obsoletes: libcontainers-image < %{version}
@ -125,12 +122,6 @@ install -D -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/containers/mounts.conf
install -D -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/containers/mounts.conf
install -D -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/containers/registries.conf
install -D -m 0644 %{SOURCE11} %{buildroot}/%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
%if 0%{?suse_version} == 1500
# /usr/etc/ does not work on Leap & SLE
install -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/profile.d/libcontainers-common-storage.sh
%else
install -D -m 0644 %{SOURCE12} %{buildroot}%{_prefix}%{_sysconfdir}/profile.d/libcontainers-common-storage.sh
%endif
install -D -m 0644 %{SOURCE7} %{buildroot}/%{_sysconfdir}/containers/registries.d/default.yaml
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE9}
install -D -m 0644 %{SOURCE9} %{buildroot}/%{_datadir}/containers/containers.conf
@ -150,17 +141,6 @@ install -D -m 0644 common-%{commonver}/docs/containers.conf.5 %{buildroot}/%{_ma
%post
# Comment out ostree_repo if it's blank [boo#1189893]
sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/storage.conf
# use btrfs storage driver if system storage is on btrfs
# For rootless it will fall back to overlay if btrfs is not working
# https://github.com/containers/storage/blob/main/docs/containers-storage.conf.5.md#storage-table
if [ $1 -eq 1 ] ; then
for dir in %{_localstatedir}/lib/containers %{_localstatedir}/lib ; do
test "$(findmnt -o FSTYPE -l --target '$dir' | grep -v FSTYPE)" != "btrfs" && CONTAINERS_USE_BTRFS_DRIVER=0
done
if [ "$CONTAINERS_USE_BTRFS_DRIVER" != "0" ]; then
sed -i 's/driver = "overlay"/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf
fi
fi
%files
%dir %{_sysconfdir}/containers
@ -175,11 +155,6 @@ fi
%config(noreplace) %{_sysconfdir}/containers/policy.json
%config(noreplace) %{_sysconfdir}/containers/storage.conf
%config(noreplace) %{_sysconfdir}/containers/mounts.conf
%if 0%{?suse_version} == 1500
%{_sysconfdir}/profile.d/libcontainers-common-storage.sh
%else
%{_prefix}%{_sysconfdir}/profile.d/libcontainers-common-storage.sh
%endif
%{_datadir}/containers/mounts.conf
%config(noreplace) %{_sysconfdir}/containers/registries.conf
%config(noreplace) %{_sysconfdir}/containers/seccomp.json