Merge f861d78 into 1cc83c0

yast · Apr 29, 2021 · cb1d966 · cb1d966
2 parents 1cc83c0 + f861d78
commit cb1d966
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 29 09:21:31 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>
+
+- Start the "memsample" tool in a subshell to avoid "Terminated"
+  message displayed at the end (bsc#1184491)
+- 4.3.38
+
 -------------------------------------------------------------------
 Wed Apr 14 11:08:52 UTC 2021 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.3.37
+Version:        4.3.38
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only

diff --git a/startup/First-Stage/F08-logging b/startup/First-Stage/F08-logging
@@ -65,7 +65,10 @@ else
     if pgrep -f memsample; then
         log "\talready running"
     else
-        memsample --sleep="${MEMSAMPLE-5}" --archive=/var/log/YaST2/memsample.zcat &
-        log "\tPID: $!"
+        # use a subshell to avoid "Terminated" message when killing the process at the end
+        (
+            memsample --sleep="${MEMSAMPLE-5}" --archive=/var/log/YaST2/memsample.zcat &
+            log "\tPID: $!"
+        )
     fi
 fi