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 2022-11-22 16:09:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcontainers-common (Old)
and /work/SRC/openSUSE:Factory/.libcontainers-common.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcontainers-common"
Tue Nov 22 16:09:44 2022 rev:50 rq:1037101 version:20210626
Changes:
--------
---
/work/SRC/openSUSE:Factory/libcontainers-common/libcontainers-common.changes
2022-11-11 14:36:19.530236067 +0100
+++
/work/SRC/openSUSE:Factory/.libcontainers-common.new.1597/libcontainers-common.changes
2022-11-22 16:09:46.169904052 +0100
@@ -1,0 +2,10 @@
+Thu Nov 17 10:51:26 UTC 2022 - Dirk Müller <dmuel...@suse.com>
+
+- add container-storage-driver.sh (bsc#1197093)
+
+-------------------------------------------------------------------
+Thu Nov 10 11:58:09 UTC 2022 - Dirk Müller <dmuel...@suse.com>
+
+- postinstall script: slight cleanup, no functional change
+
+-------------------------------------------------------------------
New:
----
container-storage-driver.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcontainers-common.spec ++++++
--- /var/tmp/diff_new_pack.SCGkvj/_old 2022-11-22 16:09:46.941907975 +0100
+++ /var/tmp/diff_new_pack.SCGkvj/_new 2022-11-22 16:09:46.945907995 +0100
@@ -48,6 +48,7 @@
Source10: containers.conf
Source11: %{name}.rpmlintrc
Source12: shortnames.conf
+Source13: container-storage-driver.sh
BuildRequires: go-go-md2man
Provides: libcontainers-image = %{version}
Provides: libcontainers-storage = %{version}
@@ -120,6 +121,7 @@
install -D -m 0644 %{SOURCE5}
%{buildroot}/%{_sysconfdir}/containers/mounts.conf
install -D -m 0644 %{SOURCE6}
%{buildroot}/%{_sysconfdir}/containers/registries.conf
install -D -m 0644 %{SOURCE12}
%{buildroot}/%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
+install -D -m 0644 %{SOURCE13}
%{buildroot}/usr/etc/profile.d/libcontainers-common-storage.sh
install -D -m 0644 %{SOURCE8}
%{buildroot}/%{_sysconfdir}/containers/registries.d/default.yaml
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE10}
install -D -m 0644 %{SOURCE10}
%{buildroot}/%{_datadir}/containers/containers.conf
@@ -139,12 +141,14 @@
%post
# Comment out ostree_repo if it's blank [boo#1189893]
sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' /etc/containers/storage.conf
-# If installing, check if /var/lib/containers (or /var/lib in its defect) is
btrfs and set driver
-# to "btrfs" if true
+# 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
- # Space to avoid ambiguity with arithmetic expansion
- fstype=$( (findmnt -o FSTYPE -l --target /var/lib/containers || findmnt -o
FSTYPE -l --target /var/lib) | grep -v FSTYPE)
- if [ "$fstype" = "btrfs" ]; then
+ for dir in /var/lib/containers /var/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
@@ -162,6 +166,7 @@
%config(noreplace) %{_sysconfdir}/containers/policy.json
%config(noreplace) %{_sysconfdir}/containers/storage.conf
%config(noreplace) %{_sysconfdir}/containers/mounts.conf
+/usr/etc/profile.d/libcontainers-common-storage.sh
%{_datadir}/containers/mounts.conf
%config(noreplace) %{_sysconfdir}/containers/registries.conf
%config(noreplace) %{_sysconfdir}/containers/seccomp.json
++++++ container-storage-driver.sh ++++++
if test "$(id -u)" -gt "0" && test -d "$HOME"; then
if test ! -e "$HOME"/.config/containers/storage.conf && 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
