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-03-17 17:02:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcontainers-common (Old)
and /work/SRC/openSUSE:Factory/.libcontainers-common.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcontainers-common"
Fri Mar 17 17:02:19 2023 rev:58 rq:1072110 version:20230214
Changes:
--------
---
/work/SRC/openSUSE:Factory/libcontainers-common/libcontainers-common.changes
2023-02-28 12:48:40.828495377 +0100
+++
/work/SRC/openSUSE:Factory/.libcontainers-common.new.31432/libcontainers-common.changes
2023-03-17 17:02:48.137221385 +0100
@@ -1,0 +2,17 @@
+Wed Mar 15 09:17:51 UTC 2023 - Dan Äermák <[email protected]>
+
+- 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 <[email protected]>
+
+- Remove obsolete Requires(post): util-linux-systemd
+
+-------------------------------------------------------------------
Old:
----
container-storage-driver.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcontainers-common.spec ++++++
--- /var/tmp/diff_new_pack.wPaMwN/_old 2023-03-17 17:02:49.053226184 +0100
+++ /var/tmp/diff_new_pack.wPaMwN/_new 2023-03-17 17:02:49.057226205 +0100
@@ -51,12 +51,9 @@
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}/%{_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 @@
%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 @@
%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
