Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libcontainers-common for
openSUSE:Factory checked in at 2023-01-24 19:42:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcontainers-common (Old)
and /work/SRC/openSUSE:Factory/.libcontainers-common.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcontainers-common"
Tue Jan 24 19:42:08 2023 rev:54 rq:1060361 version:20221122
Changes:
--------
---
/work/SRC/openSUSE:Factory/libcontainers-common/libcontainers-common.changes
2022-12-08 16:50:30.787276588 +0100
+++
/work/SRC/openSUSE:Factory/.libcontainers-common.new.32243/libcontainers-common.changes
2023-01-24 20:24:47.053933269 +0100
@@ -1,0 +2,9 @@
+Fri Jan 13 06:01:46 UTC 2023 - Danish Prakash <danish.prak...@suse.com>
+
+- storage.conf: Unset 'driver' and set 'driver_priority' to
+ allow podman to use 'btrfs' if available and fallback to
+ 'overlay' if not.
+- .spec: rm %post script to set 'btrfs' as storage driver
+ in storage.conf
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcontainers-common.spec ++++++
--- /var/tmp/diff_new_pack.lqAg6X/_old 2023-01-24 20:24:47.745937993 +0100
+++ /var/tmp/diff_new_pack.lqAg6X/_new 2023-01-24 20:24:47.749938020 +0100
@@ -140,17 +140,6 @@
%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
++++++ storage.conf ++++++
--- /var/tmp/diff_new_pack.lqAg6X/_old 2023-01-24 20:24:47.925939222 +0100
+++ /var/tmp/diff_new_pack.lqAg6X/_new 2023-01-24 20:24:47.929939249 +0100
@@ -14,11 +14,15 @@
[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"]
+
# Primary Read/Write location of container storage
# When changing the graphroot location on an SELINUX system, you must
# ensure the labeling matches the default locations labels with the
