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

Accepting request 982638 from home:dancermak:branches:devel:microos

Browse Source 
Add missing Requires(post): sed, fixes boo#1200524

OBS-URL: https://build.opensuse.org/request/show/982638
OBS-URL: https://build.opensuse.org/package/show/devel:microos/libcontainers-common?expand=0&rev=4
This commit is contained in:
Richard Brown 2022-06-14 15:40:39 +00:00 committed by Git OBS Bridge
parent 883544551b
commit c4cd3ae5d4
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcontainers-common.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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> Wed Jun 8 12:39:46 UTC 2022 - Richard Brown <rbrown@suse.com>

5
libcontainers-common.spec
View File

@ -53,7 +53,8 @@ Provides: libcontainers-storage = %{version}
Obsoletes: libcontainers-image < %{version} Obsoletes: libcontainers-image < %{version}
Obsoletes: libcontainers-storage < %{version} Obsoletes: libcontainers-storage < %{version}
Requires(post): util-linux-systemd Requires(post): util-linux-systemd
Requires(post): grep Requires(post): /usr/bin/grep
Requires(post): /usr/bin/sed
BuildArch: noarch BuildArch: noarch
%description %description
@ -138,7 +139,7 @@ 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 # If installing, check if /var/lib/containers (or /var/lib in its defect) is btrfs and set driver
# to "btrfs" if true # to "btrfs" if true
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
fstype=$((findmnt -o FSTYPE -l --target /var/lib/containers || findmnt -o FSTYPE -l --target /var/lib) | grep -v FSTYPE) fstype=`(findmnt -o FSTYPE -l --target /var/lib/containers || findmnt -o FSTYPE -l --target /var/lib) | grep -v FSTYPE`
if [ "$fstype" = "btrfs" ]; then if [ "$fstype" = "btrfs" ]; then
sed -i 's/driver = "overlay"/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf sed -i 's/driver = "overlay"/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf
fi fi