From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jun 2019 02:36:23 +0200
Subject: [PATCH] gnu: dstat: Skip devices without I/O.

Taken verbatim from a pull request[0] that will never be merged.

[0]: https://github.com/dagwieers/dstat/pull/164

From 0988589ea4ee092b285bd4049d56add5f61e3f69 Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Fri, 15 Feb 2019 18:46:57 +0100
Subject: [PATCH] Skip devices without I/O

Linux 4.18+ has added more fields to the diskstats proc file, so the
original skip condition for devices without I/O didn't apply anymore.
---
 dstat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dstat b/dstat
index 9359965..5c2fb53 100755
--- a/dstat
+++ b/dstat
@@ -763,7 +763,7 @@ class dstat_disk(dstat):
         ret = []
         for l in self.splitlines():
             if len(l) < 13: continue
-            if l[3:] == ['0',] * 11: continue
+            if l[3:] == ['0',] * (len(l) - 3): continue
             name = l[2]
             ret.append(name)
         for item in objlist: ret.append(item)
href='/guix/refs/?id=78241787d5d004f97540163f0c4d4050eec33198'>refs</a><a class='active' href='/guix/log/tests/boot-parameters.scm'>log</a><a href='/guix/tree/tests/boot-parameters.scm?id=78241787d5d004f97540163f0c4d4050eec33198'>tree</a><a href='/guix/commit/tests/boot-parameters.scm?id=78241787d5d004f97540163f0c4d4050eec33198'>commit</a><a href='/guix/diff/tests/boot-parameters.scm?id=78241787d5d004f97540163f0c4d4050eec33198'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/boot-parameters.scm'>
<input type='hidden' name='id' value='78241787d5d004f97540163f0c4d4050eec33198'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=78241787d5d004f97540163f0c4d4050eec33198'>root</a>/<a href='/guix/log/tests?id=78241787d5d004f97540163f0c4d4050eec33198'>tests</a>/<a href='/guix/log/tests/boot-parameters.scm?id=78241787d5d004f97540163f0c4d4050eec33198'>boot-parameters.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/boot-parameters.scm?id=78241787d5d004f97540163f0c4d4050eec33198&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-08-28 23:37:28 +0200'>2022-08-28</span></td><td><a href='/guix/commit/tests/boot-parameters.scm?id=3294fa2ba451c7d5ef42a5d9fac780877f364bc7'>tests: Add test for menu-entry roundtrips as sexps.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/boot-parameters.scm (%uuid-menu-entry,
%file-system-label-menu-entry): New variables.
("menu-entry roundtrip, uuid", "menu-entry roundtrip,
file-system-label"): New tests.

Signed-off-by: Marius Bakke &lt;marius@gnu.org&gt;
</span></span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2022-03-16 15:48:52 +0100'>2022-03-16</span></td><td><a href='/guix/commit/tests/boot-parameters.scm?id=47960b55268220ca1cb7d2fed41c53873181d816'>system: Improve 'read-boot-parameters' incompatibility diagnostic.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously, when reading an incompatible "parameters" file, 'guix
system' would print a warning and then crash with a wrong-type-arg
backtrace because code expects 'read-boot-parameters' to always return a
&lt;boot-parameters&gt; record.

* gnu/system.scm (read-boot-parameters): Upon incompatibility, raise an
error instead of returning #f.  Also raise a '&amp;fix-hint' condition.
* tests/boot-parameters.scm ("read, construction, mandatory fields"):
Define 'test-read-boot-parameters' as a macro; expect
'formatted-message?' exceptions rather than #f returns.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-03-01 10:30:17 -0500'>2022-03-01</span></td><td><a href='/guix/commit/tests/boot-parameters.scm?id=4a3b8f4d5981de444b3590fca8dfa1facb768933'>system: Add a version field to the &lt;boot-parameters&gt; record.</a><span class='msg-avail'>...<span class='msg-tooltip'>This version field exposes the (already present) version information of a boot
parameters file.

* gnu/system.scm (%boot-parameters-version): New variable.
(&lt;boot-parameters&gt;)[version]: New field.
(read-boot-parameters): Use it.
(operating-system-boot-parameters-file): Likewise.
* tests/boot-parameters.scm (test-read-boot-parameters): Use
%boot-parameters-version as the default version value in the template.
</span></span></td><td>Maxim Cournoyer</td></tr>