Commit b38eb68f authored by Klaus Aehlig's avatar Klaus Aehlig
Browse files

Merge branch 'stable-2.10' into stable-2.11



* stable-2.10
  (no changes)

* stable-2.9
  Push return out of genericResult
  Make htools tolerate missing "spfree" on luxi
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarHrvoje Ribicic <riba@google.com>
parents bc7dda1e fb565c43
...@@ -220,7 +220,10 @@ parseNode ktg [ name, mtotal, mnode, mfree, dtotal, dfree ...@@ -220,7 +220,10 @@ parseNode ktg [ name, mtotal, mnode, mfree, dtotal, dfree
xsptotal <- if xexcl_stor xsptotal <- if xexcl_stor
then lvconvert 0 "sptotal" sptotal then lvconvert 0 "sptotal" sptotal
else convert "spindles" spindles else convert "spindles" spindles
xspfree <- lvconvert 0 "spfree" spfree let xspfree = genericResult (const (0 :: Int)) id
$ lvconvert 0 "spfree" spfree
-- "spfree" might be missing, if sharedfile is the only
-- supported disk template
xmtotal <- lvconvert 0.0 "mtotal" mtotal xmtotal <- lvconvert 0.0 "mtotal" mtotal
xmnode <- lvconvert 0 "mnode" mnode xmnode <- lvconvert 0 "mnode" mnode
xmfree <- lvconvert 0 "mfree" mfree xmfree <- lvconvert 0 "mfree" mfree
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment