From 61b6431b6e92ccd86b43390793f1e291f322b8c3 Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Fri, 21 Jul 2023 14:04:58 +0000 Subject: [PATCH] cmd/ctrld: trim os version on freebsd --- cmd/ctrld/cli.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cmd/ctrld/cli.go b/cmd/ctrld/cli.go index a935a2e..e7f64ca 100644 --- a/cmd/ctrld/cli.go +++ b/cmd/ctrld/cli.go @@ -176,8 +176,7 @@ func initCLI() { initLogging() mainLog.Info().Msgf("starting ctrld %s", curVersion()) - oi := osinfo.New() - mainLog.Info().Msgf("os: %s", oi.String()) + mainLog.Info().Msgf("os: %s", osVersion()) // Wait for network up. if !ctrldnet.Up() { @@ -1488,3 +1487,13 @@ func dirWritable(dir string) (bool, error) { defer os.Remove(f.Name()) return true, f.Close() } + +func osVersion() string { + oi := osinfo.New() + if runtime.GOOS == "freebsd" { + if ver, _, found := strings.Cut(oi.String(), ":"); found { + return ver + } + } + return oi.String() +}