Hello community,

here is the log from the commit of package katacontainers for openSUSE:Factory 
checked in at 2019-08-28 18:35:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/katacontainers (Old)
 and      /work/SRC/openSUSE:Factory/.katacontainers.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "katacontainers"

Wed Aug 28 18:35:32 2019 rev:4 rq:726525 version:1.9.0~alpha0

Changes:
--------
--- /work/SRC/openSUSE:Factory/katacontainers/katacontainers.changes    
2019-08-22 10:52:45.441696786 +0200
+++ /work/SRC/openSUSE:Factory/.katacontainers.new.7948/katacontainers.changes  
2019-08-28 18:35:34.085282808 +0200
@@ -1,0 +2,6 @@
+Tue Aug 27 14:58:06 UTC 2019 - Marco Vedovati <[email protected]>
+
+- Remove image entry from configuration files only where both image and 
+  initrd are supported.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ katacontainers.spec ++++++
--- /var/tmp/diff_new_pack.YFaDoj/_old  2019-08-28 18:35:35.297282597 +0200
+++ /var/tmp/diff_new_pack.YFaDoj/_new  2019-08-28 18:35:35.301282597 +0200
@@ -131,8 +131,10 @@
     QEMUCMD=%{QEMUCMD} \
     install
 
-# Using initrd, so delete the image config line
-sed -i -E -e '/^image =/d' %{buildroot}/%{defaultConfigFiles}
+# Using initrd, so delete the image entries where both image and initrd is 
specified
+for f in %{buildroot}/%{defaultConfigFiles}; do
+  grep -q "^image =" "$f" && grep -q "^initrd = " "$f" && sed -i -E -e 
'/^image =/d' $f
+done
 
 # Properly set libexec path
 sed -i -E -e 's,/usr/libexec,%{_libexecdir},' 
%{buildroot}/%{defaultConfigFiles}


Reply via email to