Accepting request 919692 from devel:kubic

- Comment out ostree_repo if it's blank [boo#1189893] 

- Comment out ostree_repo [boo#1189893]

OBS-URL: https://build.opensuse.org/request/show/919692
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcontainers-common?expand=0&rev=42

libcontainers-common.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Sep 17 09:23:33 UTC 2021 - Richard Brown <rbrown@suse.com>
+
+- Comment out ostree_repo if it's blank [boo#1189893] 
+
+-------------------------------------------------------------------
+Mon Sep  6 16:08:36 UTC 2021 - Richard Brown <rbrown@suse.com>
+
+- Comment out ostree_repo [boo#1189893] 
+
 -------------------------------------------------------------------
 Fri Jul 23 08:31:52 UTC 2021 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
 

libcontainers-common.spec

@@ -134,6 +134,8 @@ install -D -m 0644 podman-%{podmanver}/docs/source/markdown/containers-mounts.co
 install -D -m 0644 common-%{commonver}/docs/containers.conf.5 %{buildroot}/%{_mandir}/man5/
 
 %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
 if [ $1 -eq 1 ] ; then

storage.conf

@@ -57,7 +57,7 @@ size = ""
 # remap-group = "storage"
 
 # If specified, use OSTree to deduplicate files with the overlay backend
-ostree_repo = ""
+# ostree_repo = ""
 
 # Set to skip a PRIVATE bind mount on the storage home directory.  Only supported by
 # certain container storage drivers