From ce8de929788a7c27dd7c55d7f974192928627b2d Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 10 Jun 2017 15:37:31 +0100 Subject: [PATCH] cmd: Fix disk "size" handling commit bdf9b1f31ae92 introduced a bug with disk size handling where GB was not handled correctly. Fix it. Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/util.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cmd/linuxkit/util.go b/src/cmd/linuxkit/util.go index 5e766ba10..edacdf1fc 100644 --- a/src/cmd/linuxkit/util.go +++ b/src/cmd/linuxkit/util.go @@ -109,16 +109,17 @@ func getDiskSizeMB(s string) (int, error) { } sz := len(s) if strings.HasSuffix(s, "M") { - i, err := strconv.Atoi(s[:sz-1]) - if err != nil { - return 0, err - } - return i, nil + return strconv.Atoi(s[:sz-1]) } if strings.HasSuffix(s, "G") { s = s[:sz-1] } - return strconv.Atoi(s) + + i, err := strconv.Atoi(s) + if err != nil { + return 0, err + } + return 1024 * i, nil } // DiskConfig is the config for a disk