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

Accepting request 1060838 from home:danishprakash:branches:devel:microos

Browse Source 
- Reverts https://build.opensuse.org/request/show/1060361
  Changes introduced to c/storage's storage.conf which adds
  a driver_priority attribute would break consumers of libcontainer-common
  as long as those packages are vendoring an older c/storage version.
  Instead of patching every consumer, we're reverting this change, until
  those packages have been updated downstream. [boo#1207509]

OBS-URL: https://build.opensuse.org/request/show/1060838
OBS-URL: https://build.opensuse.org/package/show/devel:microos/libcontainers-common?expand=0&rev=14
This commit is contained in:
Richard Brown 2023-01-26 09:28:16 +00:00 committed by Git OBS Bridge
parent b70cdf2107
commit 81680e50bf
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libcontainers-common.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Jan 25 10:01:49 UTC 2023 - Danish Prakash <danish.prakash@suse.com>
- Reverts https://build.opensuse.org/request/show/1060361
Changes introduced to c/storage's storage.conf which adds
a driver_priority attribute would break consumers of libcontainer-common
as long as those packages are vendoring an older c/storage version.
Instead of patching every consumer, we're reverting this change, until
those packages have been updated downstream. [boo#1207509]
-------------------------------------------------------------------
Fri Jan 13 06:01:46 UTC 2023 - Danish Prakash <danish.prakash@suse.com>

11
libcontainers-common.spec
View File

@ -140,6 +140,17 @@ 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

4
storage.conf
View File

@ -14,14 +14,14 @@
[storage]
# Default Storage Driver, Must be set for proper operation.
# driver = "overlay"
driver = "overlay"
# Temporary storage location
runroot = "/run/containers/storage"
# Priority list for the storage drivers that will be tested one
# after the other to pick the storage driver if it is not defined.
driver_priority = ["btrfs", "overlay"]
# driver_priority = ["btrfs", "overlay"]
# Primary Read/Write location of container storage
# When changing the graphroot location on an SELINUX system, you must