Merge pull request #1017 from yast/memsample_stderr

yast · Feb 1, 2022 · d3f142e · d3f142e
2 parents b090564 + c5a5012
commit d3f142e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/bin/memsample b/bin/memsample
@@ -39,6 +39,7 @@ while true; do
   I=$((I + 1))
   I_TIME=$(printf %04d $I)-$(date -Iseconds)
 
+  # redirect STDERR to not break the YaST UI (bsc#1195116)
   {
       echo "### df-$I_TIME"
       df -k /
@@ -48,7 +49,7 @@ while true; do
 
       echo "### ps-$I_TIME"
       memsample_ps
-  } | gzip -c >> "$ARCHIVE"
+  } 2>&1 | gzip -c >> "$ARCHIVE"
 
   sleep "$SLEEP"
 done
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb  1 07:52:48 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>
+
+- Redirect the STDERR output in the memsample script to not
+  break the YaST UI (bsc#1195116)
+- 4.4.38
+
 -------------------------------------------------------------------
 Thu Jan 27 07:50:21 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        4.4.37
+Version:        4.4.38
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only