diff --git a/libcontainers-common.changes b/libcontainers-common.changes index 8f93f39..155db66 100644 --- a/libcontainers-common.changes +++ b/libcontainers-common.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jun 15 10:20:16 UTC 2022 - Fabian Vogt + +- Use $() again in %post, but with a space for POSIX compliance + +------------------------------------------------------------------- +Tue Jun 14 13:53:43 UTC 2022 - Dan Čermák + +- Add missing Requires(post): sed, fixes boo#1200524 +- Make %post compatible with dash + ------------------------------------------------------------------- Wed Jun 8 12:39:46 UTC 2022 - Richard Brown diff --git a/libcontainers-common.spec b/libcontainers-common.spec index 276ff13..f712d36 100644 --- a/libcontainers-common.spec +++ b/libcontainers-common.spec @@ -53,7 +53,8 @@ Provides: libcontainers-storage = %{version} Obsoletes: libcontainers-image < %{version} Obsoletes: libcontainers-storage < %{version} Requires(post): util-linux-systemd -Requires(post): grep +Requires(post): /usr/bin/grep +Requires(post): /usr/bin/sed BuildArch: noarch %description @@ -138,7 +139,8 @@ 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 if [ $1 -eq 1 ] ; then - fstype=$((findmnt -o FSTYPE -l --target /var/lib/containers || findmnt -o FSTYPE -l --target /var/lib) | grep -v FSTYPE) + # 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 sed -i 's/driver = "overlay"/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf fi