rpm/libcontainers-common
SHA256
1
0
Fork 0
forked from pool/libcontainers-common
Code Pull Requests Activity

Accepting request 982766 from devel:microos

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/982766
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcontainers-common?expand=0&rev=47
This commit is contained in:
Dominique Leuenberger 2022-06-17 19:18:27 +00:00 committed by Git OBS Bridge
commit 3935575842
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libcontainers-common.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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>
- Add missing Requires(post): sed, fixes boo#1200524
- Make %post compatible with dash
-------------------------------------------------------------------
Wed Jun 8 12:39:46 UTC 2022 - Richard Brown <rbrown@suse.com>

6
libcontainers-common.spec
View File

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