From 3c1da423fa112efad620d8378814ae07058d67ae Mon Sep 17 00:00:00 2001 From: Jan Martens Date: Tue, 14 May 2019 15:57:32 +0200 Subject: [PATCH] engine: resources: nspawn: Trim possible systemd version suffix --- engine/resources/nspawn.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/engine/resources/nspawn.go b/engine/resources/nspawn.go index 8faa9fc5..3af3b21a 100644 --- a/engine/resources/nspawn.go +++ b/engine/resources/nspawn.go @@ -21,6 +21,7 @@ import ( "errors" "fmt" "strconv" + "strings" "unicode" "github.com/purpleidea/mgmt/engine" @@ -358,10 +359,12 @@ func systemdVersion() (uint16, error) { return 0, errwrap.Wrapf(err, "could not get version property") } // lose the surrounding quotes - verNum, err := strconv.Unquote(verString) + verNumString, err := strconv.Unquote(verString) if err != nil { return 0, errwrap.Wrapf(err, "error unquoting version number") } + // trim possible version suffix like in "242.19-1" + verNum := strings.Split(verNumString, ".")[0] // cast to uint16 ver, err := strconv.ParseUint(verNum, 10, 16) if err != nil {