From 74602dc0df89a0c29e44cf0289863099ad1bd7c8 Mon Sep 17 00:00:00 2001 From: yo Date: Sun, 16 Oct 2022 15:18:35 +0200 Subject: [PATCH] Add arch property to jailhost --- cmd/jailhost.go | 12 ++++++++++++ cmd/struct.go | 1 + 2 files changed, 13 insertions(+) diff --git a/cmd/jailhost.go b/cmd/jailhost.go index cd7fd14..665dad5 100644 --- a/cmd/jailhost.go +++ b/cmd/jailhost.go @@ -179,6 +179,15 @@ func getHostId() (string, error) { return strings.Split(string(content), "\n")[0], nil } +func getArch() (string, error) { + out, err := executeCommand("/usr/bin/uname -p") + if err != nil { + return "", fmt.Errorf("Error executing \"/usr/bin/uname -p\": %v", err) + } + + return strings.Split(out, "\n")[0], nil +} + func getFreeBSDVersion() (FreeBSDVersion, error) { var version FreeBSDVersion regex := `([0-9]{1,2})(\.)?([0-9]{1,2})?\-([^\-]*)(\-)?(p[0-9]{1,2})?` @@ -219,6 +228,9 @@ func NewJailHost() (JailHost, error) { if jh.hostname, err = getHostname(); err != nil { return jh, err } + if jh.arch, err = getArch(); err != nil { + return jh, err + } if jh.hostid, err = getHostId(); err != nil { return jh, err } diff --git a/cmd/struct.go b/cmd/struct.go index f6e1237..50cc073 100644 --- a/cmd/struct.go +++ b/cmd/struct.go @@ -213,6 +213,7 @@ type FreeBSDVersion struct { type JailHost struct { hostname string hostid string + arch string default_gateway4 string default_gateway6 string default_interface string