1
0

Accepting request 982756 from home:favogt:branches:devel:microos

- Use $() again in %post, but with a space for POSIX compliance

OBS-URL: https://build.opensuse.org/request/show/982756
OBS-URL: https://build.opensuse.org/package/show/devel:microos/libcontainers-common?expand=0&rev=5
This commit is contained in:
Richard Brown 2022-06-15 11:16:31 +00:00 committed by Git OBS Bridge
parent c4cd3ae5d4
commit 6f851ba5fc
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 15 10:20:16 UTC 2022 - Fabian Vogt <fvogt@suse.com>
- Use $() again in %post, but with a space for POSIX compliance
-------------------------------------------------------------------
Tue Jun 14 13:53:43 UTC 2022 - Dan Čermák <dcermak@suse.com>

View File

@ -139,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