Rename util -> osutil

53 files changed, 132 insertions, 132 deletions

diff --git a/client/go/internal/admin/clusterstate/cluster_state.go b/client/go/internal/admin/clusterstate/cluster_state.go
index 6863e0a75d1..fe6c6c1a4d2 100644
--- a/client/go/internal/admin/clusterstate/cluster_state.go
+++ b/client/go/internal/admin/clusterstate/cluster_state.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 // common struct used various places in the clustercontroller REST api:
@@ -117,6 +117,6 @@ func (model *VespaModelConfig) getClusterState(cluster string) (*ClusterState, *
 		return &parsedJson, &cc
 	}
 	// no success:
-	util.ExitMsg(fmt.Sprint(errs))
+	osutil.ExitMsg(fmt.Sprint(errs))
 	panic("unreachable")
 }
diff --git a/client/go/internal/admin/clusterstate/detect_model.go b/client/go/internal/admin/clusterstate/detect_model.go
index d9589575c49..db2e167ea6a 100644
--- a/client/go/internal/admin/clusterstate/detect_model.go
+++ b/client/go/internal/admin/clusterstate/detect_model.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -17,11 +17,11 @@ func getConfigServerHosts(s string) []string {
 	if s != "" {
 		return []string{s}
 	}
-	backticks := util.BackTicksForwardStderr
+	backticks := osutil.BackTicksForwardStderr
 	got, err := backticks.Run(vespa.FindHome()+"/bin/vespa-print-default", "configservers")
 	res := strings.Fields(got)
 	if err != nil || len(res) < 1 {
-		util.ExitMsg("bad configservers: " + got)
+		osutil.ExitMsg("bad configservers: " + got)
 	}
 	trace.Debug("found", len(res), "configservers:", res)
 	return res
@@ -31,13 +31,13 @@ func getConfigServerPort(i int) int {
 	if i > 0 {
 		return i
 	}
-	backticks := util.BackTicksForwardStderr
+	backticks := osutil.BackTicksForwardStderr
 	got, err := backticks.Run(vespa.FindHome()+"/bin/vespa-print-default", "configserver_rpc_port")
 	if err == nil {
 		i, err = strconv.Atoi(strings.TrimSpace(got))
 	}
 	if err != nil || i < 1 {
-		util.ExitMsg("bad configserver_rpc_port: " + got)
+		osutil.ExitMsg("bad configserver_rpc_port: " + got)
 	}
 	trace.Debug("found configservers rpc port:", i)
 	return i
@@ -55,13 +55,13 @@ func detectModel(opts *Options) *VespaModelConfig {
 			"-p", strconv.Itoa(cfgPort),
 			"-s", cfgHost,
 		}
-		backticks := util.BackTicksForwardStderr
+		backticks := osutil.BackTicksForwardStderr
 		data, err := backticks.Run(vespa.FindHome()+"/bin/vespa-get-config", args...)
 		parsed := parseModelConfig(data)
 		if err == nil && parsed != nil {
 			return parsed
 		}
 	}
-	util.ExitMsg("could not get model config")
+	osutil.ExitMsg("could not get model config")
 	panic("unreachable")
 }
diff --git a/client/go/internal/admin/clusterstate/set_node_state.go b/client/go/internal/admin/clusterstate/set_node_state.go
index ed120d99218..023d3ed71c8 100644
--- a/client/go/internal/admin/clusterstate/set_node_state.go
+++ b/client/go/internal/admin/clusterstate/set_node_state.go
@@ -16,7 +16,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 	"github.com/vespa-engine/vespa/client/go/internal/build"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 const (
@@ -80,7 +80,7 @@ func runSetNodeState(opts *Options, args []string) {
 	}
 	wanted, err := knownState(args[0])
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	reason := ""
 	if len(args) > 1 {
@@ -138,7 +138,7 @@ func (cc *ClusterControllerSpec) setNodeUserState(s serviceSpec, wanted KnownSta
 	}
 	jsonBytes, err := json.Marshal(request)
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	url := fmt.Sprintf("http://%s:%d/cluster/v2/%s/%s/%d",
 		cc.host, cc.port,
diff --git a/client/go/internal/admin/deploy/cmd.go b/client/go/internal/admin/deploy/cmd.go
index b82d1bf2968..f2edf3c7450 100644
--- a/client/go/internal/admin/deploy/cmd.go
+++ b/client/go/internal/admin/deploy/cmd.go
@@ -11,7 +11,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 	"github.com/vespa-engine/vespa/client/go/internal/build"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -24,7 +24,7 @@ func NewDeployCmd() *cobra.Command {
 		curOptions Options
 	)
 	if err := vespa.LoadDefaultEnv(); err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	cobra.EnableCommandSorting = false
 	cmd := &cobra.Command{
diff --git a/client/go/internal/admin/deploy/curl.go b/client/go/internal/admin/deploy/curl.go
index 77f280b06c4..accd16b06f5 100644
--- a/client/go/internal/admin/deploy/curl.go
+++ b/client/go/internal/admin/deploy/curl.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 	"github.com/vespa-engine/vespa/client/go/internal/curl"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -60,20 +60,20 @@ func urlWithoutQuery(url string) string {
 func newCurlCommand(url string, args []string) *curl.Command {
 	tls, err := vespa.LoadTlsConfig()
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	if tls != nil && strings.HasPrefix(url, "http:") {
 		url = "https:" + url[5:]
 	}
 	cmd, err := curl.RawArgs(url, args...)
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	if tls != nil {
 		if tls.DisableHostnameValidation {
 			cmd, err = curl.RawArgs(url, append(args, "--insecure")...)
 			if err != nil {
-				util.ExitErr(err)
+				osutil.ExitErr(err)
 			}
 		}
 		cmd.PrivateKey = tls.Files.PrivateKey
diff --git a/client/go/internal/admin/deploy/fetch.go b/client/go/internal/admin/deploy/fetch.go
index bb68722b6fe..010c0b1f324 100644
--- a/client/go/internal/admin/deploy/fetch.go
+++ b/client/go/internal/admin/deploy/fetch.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 // main entry point for vespa-deploy fetch
@@ -90,7 +90,7 @@ func getPartAfterSlash(path string) string {
 		return parts[idx-1]
 	}
 	if idx == 0 {
-		util.ExitMsg("cannot find part after slash: " + path)
+		osutil.ExitMsg("cannot find part after slash: " + path)
 	}
 	return parts[idx]
 }
diff --git a/client/go/internal/admin/deploy/persist.go b/client/go/internal/admin/deploy/persist.go
index bfa43ec4126..781fc64106a 100644
--- a/client/go/internal/admin/deploy/persist.go
+++ b/client/go/internal/admin/deploy/persist.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 const (
@@ -43,11 +43,11 @@ func configsourceUrlUsedFile() string {
 func createTenantDir(tenant string) string {
 	vespaDeployTempDir, err := createVespaDeployDir()
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	tdir := filepath.Join(vespaDeployTempDir, tenant)
 	if err := os.MkdirAll(tdir, 0700); err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	return tdir
 }
@@ -80,7 +80,7 @@ func getSessionIdFromFile(tenant string) string {
 	fn := filepath.Join(dir, sessionIdFileName)
 	bytes, err := os.ReadFile(fn)
 	if err != nil {
-		util.ExitMsg("Could not read session id from file, and no session id supplied as argument. Exiting.")
+		osutil.ExitMsg("Could not read session id from file, and no session id supplied as argument. Exiting.")
 	}
 	trace.Trace("Session-id", string(bytes), "found from file", fn)
 	return string(bytes)
diff --git a/client/go/internal/admin/deploy/urls.go b/client/go/internal/admin/deploy/urls.go
index e9110bd9463..e840f4de29c 100644
--- a/client/go/internal/admin/deploy/urls.go
+++ b/client/go/internal/admin/deploy/urls.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -28,7 +28,7 @@ func makeConfigsourceUrls(opts *Options) []string {
 	var results = make([]string, 0, 3)
 	if opts.ServerHost == "" {
 		home := vespa.FindHome()
-		backticks := util.BackTicksForwardStderr
+		backticks := osutil.BackTicksForwardStderr
 		configsources, _ := backticks.Run(home+"/bin/vespa-print-default", "configservers_http")
 		for _, src := range strings.Split(configsources, "\n") {
 			colonParts := strings.Split(src, ":")
diff --git a/client/go/internal/admin/jvm/application_container.go b/client/go/internal/admin/jvm/application_container.go
index 37f9bccd1ff..3806dfea302 100644
--- a/client/go/internal/admin/jvm/application_container.go
+++ b/client/go/internal/admin/jvm/application_container.go
@@ -13,7 +13,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/prog"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 const (
@@ -177,6 +177,6 @@ func (c *ApplicationContainer) exportExtraEnv(ps *prog.Spec) {
 	if c.ConfigId() != "" {
 		ps.Setenv(envvars.VESPA_CONFIG_ID, c.ConfigId())
 	} else {
-		util.ExitMsg("application container requires a config id")
+		osutil.ExitMsg("application container requires a config id")
 	}
 }
diff --git a/client/go/internal/admin/jvm/container.go b/client/go/internal/admin/jvm/container.go
index 5384a6c1ea5..852bdb2464b 100644
--- a/client/go/internal/admin/jvm/container.go
+++ b/client/go/internal/admin/jvm/container.go
@@ -11,7 +11,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/prog"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 	"github.com/vespa-engine/vespa/client/go/internal/list"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 type Container interface {
@@ -72,5 +72,5 @@ func (cb *containerBase) Exec() {
 	trace.Info("JVM env:", readableEnv(p.Env))
 	trace.Info("JVM exec:", argv)
 	err := p.Run()
-	util.ExitErr(err)
+	osutil.ExitErr(err)
 }
diff --git a/client/go/internal/admin/jvm/env.go b/client/go/internal/admin/jvm/env.go
index 6fcd39a5a1b..ab7b005668b 100644
--- a/client/go/internal/admin/jvm/env.go
+++ b/client/go/internal/admin/jvm/env.go
@@ -12,7 +12,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/prog"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 	"github.com/vespa-engine/vespa/client/go/internal/ioutil"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 func (opts *Options) exportEnvSettings(ps *prog.Spec) {
@@ -46,6 +46,6 @@ func (opts *Options) exportEnvSettings(ps *prog.Spec) {
 			ps.Setenv(envvars.LD_PRELOAD, preload)
 		}
 	}
-	util.OptionallyReduceTimerFrequency()
+	osutil.OptionallyReduceTimerFrequency()
 	c.exportExtraEnv(ps)
 }
diff --git a/client/go/internal/admin/jvm/mem_avail.go b/client/go/internal/admin/jvm/mem_avail.go
index bcc475e8ba8..df5acf79043 100644
--- a/client/go/internal/admin/jvm/mem_avail.go
+++ b/client/go/internal/admin/jvm/mem_avail.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 func parseFree(txt string) AmountOfMemory {
@@ -91,7 +91,7 @@ func vespa_cg2get_impl(rootdir, limitname string) (output string, err error) {
 
 func getAvailableMemory() AmountOfMemory {
 	result := BytesOfMemory(0)
-	backticks := util.BackTicksWithStderr
+	backticks := osutil.BackTicksWithStderr
 	freeOutput, err := backticks.Run("free", "-m")
 	if err == nil {
 		result = parseFree(freeOutput)
diff --git a/client/go/internal/admin/jvm/options.go b/client/go/internal/admin/jvm/options.go
index 3a1a508114a..30c07526a40 100644
--- a/client/go/internal/admin/jvm/options.go
+++ b/client/go/internal/admin/jvm/options.go
@@ -11,7 +11,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 	"github.com/vespa-engine/vespa/client/go/internal/list"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -21,12 +21,12 @@ type Options struct {
 	jvmArgs     list.ArrayList[string]
 	mainClass   string
 	jarWithDeps string
-	fixSpec     util.FixSpec
+	fixSpec     osutil.FixSpec
 }
 
 func NewOptions(c Container) *Options {
 	vespaUid, vespaGid := vespa.FindVespaUidAndGid()
-	fixSpec := util.FixSpec{
+	fixSpec := osutil.FixSpec{
 		UserId:   vespaUid,
 		GroupId:  vespaGid,
 		DirMode:  0755,
@@ -80,7 +80,7 @@ func (opts *Options) AddJvmArgsFromString(args string) {
 
 func (opts *Options) ConfigureCpuCount(cnt int) {
 	if cnt <= 0 {
-		out, err := util.BackTicksForwardStderr.Run("nproc", "--all")
+		out, err := osutil.BackTicksForwardStderr.Run("nproc", "--all")
 		if err != nil {
 			trace.Trace("failed nproc:", err)
 		} else {
diff --git a/client/go/internal/admin/jvm/properties.go b/client/go/internal/admin/jvm/properties.go
index 367de49d6c9..d0016e03b51 100644
--- a/client/go/internal/admin/jvm/properties.go
+++ b/client/go/internal/admin/jvm/properties.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 // quote as specified in JDK source file java.base/share/classes/java/util/Properties.java
@@ -101,6 +101,6 @@ func writeEnvAsProperties(envv []string, propsFile string) {
 	trace.Trace("write props file:", propsFile)
 	err := os.WriteFile(propsFile, envAsProperties(envv), 0600)
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 }
diff --git a/client/go/internal/admin/jvm/qr_start_cfg.go b/client/go/internal/admin/jvm/qr_start_cfg.go
index 7177c4c1a2f..a14ab0d1946 100644
--- a/client/go/internal/admin/jvm/qr_start_cfg.go
+++ b/client/go/internal/admin/jvm/qr_start_cfg.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 type QrStartConfig struct {
@@ -42,10 +42,10 @@ func (a *ApplicationContainer) getQrStartCfg() *QrStartConfig {
 		"-n", "search.config.qr-start",
 		"-i", a.ConfigId(),
 	}
-	backticks := util.BackTicksForwardStderr
+	backticks := osutil.BackTicksForwardStderr
 	data, err := backticks.Run("vespa-get-config", args...)
 	if err != nil {
-		util.ExitMsg("could not get qr-start config: " + err.Error())
+		osutil.ExitMsg("could not get qr-start config: " + err.Error())
 	} else {
 		codec := json.NewDecoder(strings.NewReader(data))
 		err = codec.Decode(&parsedJson)
diff --git a/client/go/internal/admin/jvm/standalone_container.go b/client/go/internal/admin/jvm/standalone_container.go
index 23f712851ff..20031bc7725 100644
--- a/client/go/internal/admin/jvm/standalone_container.go
+++ b/client/go/internal/admin/jvm/standalone_container.go
@@ -10,7 +10,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/prog"
 	"github.com/vespa-engine/vespa/client/go/internal/ioutil"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 const (
@@ -82,6 +82,6 @@ func (c *StandaloneContainer) exportExtraEnv(ps *prog.Spec) {
 	if ioutil.IsDir(app) {
 		ps.Setenv(envvars.STANDALONE_JDISC_APP_LOCATION, app)
 	} else {
-		util.ExitMsg("standalone container requires an application directory, missing: " + app)
+		osutil.ExitMsg("standalone container requires an application directory, missing: " + app)
 	}
 }
diff --git a/client/go/internal/admin/jvm/zk_locks.go b/client/go/internal/admin/jvm/zk_locks.go
index 0a307c5a38a..3f0c8ea3301 100644
--- a/client/go/internal/admin/jvm/zk_locks.go
+++ b/client/go/internal/admin/jvm/zk_locks.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 const (
@@ -16,12 +16,12 @@ const (
 )
 
 func RemoveStaleZkLocks(c Container) {
-	backticks := util.BackTicksWithStderr
+	backticks := osutil.BackTicksWithStderr
 	cmd := fmt.Sprintf("rm -f '%s/%s.%s'*lck", defaults.VespaHome(), ZOOKEEPER_LOG_FILE_PREFIX, c.ServiceName())
 	trace.Trace("cleaning locks:", cmd)
 	out, err := backticks.Run("/bin/sh", "-c", cmd)
 	if err != nil {
 		trace.Warning("Failure [", out, "] when running command:", cmd)
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 }
diff --git a/client/go/internal/admin/prog/numactl.go b/client/go/internal/admin/prog/numactl.go
index da159529ec0..58bec66e986 100644
--- a/client/go/internal/admin/prog/numactl.go
+++ b/client/go/internal/admin/prog/numactl.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 const (
@@ -23,7 +23,7 @@ func (p *Spec) ConfigureNumaCtl() {
 	if p.Getenv(envvars.VESPA_NO_NUMACTL) != "" {
 		return
 	}
-	backticks := util.BackTicksIgnoreStderr
+	backticks := osutil.BackTicksIgnoreStderr
 	out, err := backticks.Run(NUMACTL_PROG, "--hardware")
 	trace.Debug("numactl --hardware says:", out)
 	if err != nil {
diff --git a/client/go/internal/admin/prog/run.go b/client/go/internal/admin/prog/run.go
index 7dafbad1446..31a88610697 100644
--- a/client/go/internal/admin/prog/run.go
+++ b/client/go/internal/admin/prog/run.go
@@ -5,7 +5,7 @@ package prog
 
 import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 func (spec *Spec) Run() error {
@@ -22,5 +22,5 @@ func (spec *Spec) Run() error {
 		spec.Setenv(envvars.LD_PRELOAD, spec.vespaMallocPreload)
 	}
 	envv := spec.EffectiveEnv()
-	return util.Execvpe(prog, args, envv)
+	return osutil.Execvpe(prog, args, envv)
 }
diff --git a/client/go/internal/admin/prog/valgrind.go b/client/go/internal/admin/prog/valgrind.go
index 301146bd444..a8a41b95245 100644
--- a/client/go/internal/admin/prog/valgrind.go
+++ b/client/go/internal/admin/prog/valgrind.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -23,7 +23,7 @@ func (p *Spec) ConfigureValgrind() {
 	p.shouldUseCallgrind = false
 	if p.MatchesListEnv(envvars.VESPA_USE_VALGRIND) {
 		trace.Trace("using valgrind as", p.Program, "has basename in", envvars.VESPA_USE_VALGRIND)
-		backticks := util.BackTicksWithStderr
+		backticks := osutil.BackTicksWithStderr
 		out, err := backticks.Run(VALGRIND_PROG, "--help")
 		if err != nil {
 			trace.Trace("trial run of valgrind fails:", err, "=>", out)
diff --git a/client/go/internal/admin/prog/valgrind_test.go b/client/go/internal/admin/prog/valgrind_test.go
index 0b61d5c499c..30dcca0c724 100644
--- a/client/go/internal/admin/prog/valgrind_test.go
+++ b/client/go/internal/admin/prog/valgrind_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 var tmpBin string
@@ -22,7 +22,7 @@ func useMock(prog, target string) {
 	os.Remove(symlink)
 	err := os.Symlink(mock, symlink)
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 }
 
diff --git a/client/go/internal/admin/vespa-wrapper/configserver/check.go b/client/go/internal/admin/vespa-wrapper/configserver/check.go
index 2629d64bdc4..a9c1c09348e 100644
--- a/client/go/internal/admin/vespa-wrapper/configserver/check.go
+++ b/client/go/internal/admin/vespa-wrapper/configserver/check.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 func checkIsConfigserver(myname string) {
@@ -20,5 +20,5 @@ func checkIsConfigserver(myname string) {
 		}
 	}
 	trace.Warning("only these hosts should run a config server:", onlyHosts)
-	util.ExitMsg(fmt.Sprintf("this host [%s] should not run a config server", myname))
+	osutil.ExitMsg(fmt.Sprintf("this host [%s] should not run a config server", myname))
 }
diff --git a/client/go/internal/admin/vespa-wrapper/configserver/env.go b/client/go/internal/admin/vespa-wrapper/configserver/env.go
index 3b43fc269f8..b4dac91d275 100644
--- a/client/go/internal/admin/vespa-wrapper/configserver/env.go
+++ b/client/go/internal/admin/vespa-wrapper/configserver/env.go
@@ -8,7 +8,7 @@ import (
 	"os"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 func exportSettings(vespaHome string) {
@@ -27,5 +27,5 @@ func exportSettings(vespaHome string) {
 	os.Setenv(envvars.STANDALONE_JDISC_APP_LOCATION, app)
 	os.Setenv(envvars.STANDALONE_JDISC_DEPLOYMENT_PROFILE, "configserver")
 	os.Setenv(envvars.MALLOC_ARENA_MAX, "1")
-	util.OptionallyReduceTimerFrequency()
+	osutil.OptionallyReduceTimerFrequency()
 }
diff --git a/client/go/internal/admin/vespa-wrapper/configserver/fix_dirs_and_files.go b/client/go/internal/admin/vespa-wrapper/configserver/fix_dirs_and_files.go
index 87f5f13d9d0..349366cb928 100644
--- a/client/go/internal/admin/vespa-wrapper/configserver/fix_dirs_and_files.go
+++ b/client/go/internal/admin/vespa-wrapper/configserver/fix_dirs_and_files.go
@@ -4,13 +4,13 @@
 package configserver
 
 import (
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
-func makeFixSpec() util.FixSpec {
+func makeFixSpec() osutil.FixSpec {
 	vespaUid, vespaGid := vespa.FindVespaUidAndGid()
-	return util.FixSpec{
+	return osutil.FixSpec{
 		UserId:   vespaUid,
 		GroupId:  vespaGid,
 		DirMode:  0755,
@@ -18,7 +18,7 @@ func makeFixSpec() util.FixSpec {
 	}
 }
 
-func fixDirsAndFiles(fixSpec util.FixSpec) {
+func fixDirsAndFiles(fixSpec osutil.FixSpec) {
 	fixSpec.FixDir("var/zookeeper")
 	fixSpec.FixDir("var/zookeeper/conf")
 	fixSpec.FixDir("var/zookeeper/version-2")
diff --git a/client/go/internal/admin/vespa-wrapper/configserver/logd.go b/client/go/internal/admin/vespa-wrapper/configserver/logd.go
index 99fc9aa622a..3d51ce317a2 100644
--- a/client/go/internal/admin/vespa-wrapper/configserver/logd.go
+++ b/client/go/internal/admin/vespa-wrapper/configserver/logd.go
@@ -8,12 +8,12 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 func maybeStartLogd() {
 	if os.Getenv(envvars.VESPA_CONFIGSERVER_MULTITENANT) == "true" {
-		backticks := util.BackTicksForwardStderr
+		backticks := osutil.BackTicksForwardStderr
 		out, err := backticks.Run("libexec/vespa/start-logd")
 		if err != nil {
 			panic(err)
diff --git a/client/go/internal/admin/vespa-wrapper/configserver/runserver.go b/client/go/internal/admin/vespa-wrapper/configserver/runserver.go
index 6249d2bb6e8..5fdaa5fa9b8 100644
--- a/client/go/internal/admin/vespa-wrapper/configserver/runserver.go
+++ b/client/go/internal/admin/vespa-wrapper/configserver/runserver.go
@@ -10,7 +10,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 	"github.com/vespa-engine/vespa/client/go/internal/ioutil"
 	"github.com/vespa-engine/vespa/client/go/internal/list"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 const (
@@ -40,7 +40,7 @@ func (rs *RunServer) ProgPath() string {
 }
 
 func (rs *RunServer) WouldRun() bool {
-	backticks := util.BackTicksForwardStderr
+	backticks := osutil.BackTicksForwardStderr
 	out, err := backticks.Run(rs.ProgPath(), "-s", rs.ServiceName, "-p", rs.PidFile(), "-W")
 	trace.Trace("output from -W:", out, "error:", err)
 	return err == nil
@@ -56,6 +56,6 @@ func (rs *RunServer) Exec(prog string) {
 		prog,
 	}
 	argv.AppendAll(rs.Args...)
-	err := util.Execvp(rs.ProgPath(), argv)
-	util.ExitErr(err)
+	err := osutil.Execvp(rs.ProgPath(), argv)
+	osutil.ExitErr(err)
 }
diff --git a/client/go/internal/admin/vespa-wrapper/configserver/start.go b/client/go/internal/admin/vespa-wrapper/configserver/start.go
index e1ccccee912..452ea714100 100644
--- a/client/go/internal/admin/vespa-wrapper/configserver/start.go
+++ b/client/go/internal/admin/vespa-wrapper/configserver/start.go
@@ -9,7 +9,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/jvm"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -37,7 +37,7 @@ func commonPreChecks() (veHome string) {
 	checkIsConfigserver(veHost)
 	e = os.Chdir(veHome)
 	if e != nil {
-		util.ExitErr(e)
+		osutil.ExitErr(e)
 	}
 	return
 }
@@ -45,8 +45,8 @@ func commonPreChecks() (veHome string) {
 func JustStartConfigserver() int {
 	vespaHome := commonPreChecks()
 	vespa.CheckCorrectUser()
-	util.TuneResourceLimits()
-	util.TuneLogging(SERVICE_NAME, "com.google.api.client.http.HttpTransport", "config=off")
+	osutil.TuneResourceLimits()
+	osutil.TuneLogging(SERVICE_NAME, "com.google.api.client.http.HttpTransport", "config=off")
 	exportSettings(vespaHome)
 	removeStaleZkLocks(vespaHome)
 	c := jvm.NewStandaloneContainer(SERVICE_NAME)
@@ -76,7 +76,7 @@ func runConfigserverWithRunserver() int {
 func StartConfigserverEtc() int {
 	vespaHome := commonPreChecks()
 	vespa.RunPreStart()
-	util.TuneResourceLimits()
+	osutil.TuneResourceLimits()
 	fixSpec := makeFixSpec()
 	fixDirsAndFiles(fixSpec)
 	exportSettings(vespaHome)
diff --git a/client/go/internal/admin/vespa-wrapper/configserver/zk.go b/client/go/internal/admin/vespa-wrapper/configserver/zk.go
index 2fee37f0662..c14c8fe8e29 100644
--- a/client/go/internal/admin/vespa-wrapper/configserver/zk.go
+++ b/client/go/internal/admin/vespa-wrapper/configserver/zk.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 const (
@@ -15,7 +15,7 @@ const (
 )
 
 func removeStaleZkLocks(vespaHome string) {
-	backticks := util.BackTicksIgnoreStderr
+	backticks := osutil.BackTicksIgnoreStderr
 	cmd := fmt.Sprintf("rm -f '%s/%s'*lck", vespaHome, ZOOKEEPER_LOG_FILE_PREFIX)
 	trace.Trace("cleaning locks:", cmd)
 	backticks.Run("/bin/sh", "-c", cmd)
diff --git a/client/go/internal/admin/vespa-wrapper/main.go b/client/go/internal/admin/vespa-wrapper/main.go
index b760c09b857..32c5f909491 100644
--- a/client/go/internal/admin/vespa-wrapper/main.go
+++ b/client/go/internal/admin/vespa-wrapper/main.go
@@ -17,7 +17,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/vespa-wrapper/services"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/vespa-wrapper/standalone"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/vespa-wrapper/startcbinary"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -99,7 +99,7 @@ func main() {
 
 func handleSimplePanic() {
 	if r := recover(); r != nil {
-		if jee, ok := r.(*util.ExitError); ok {
+		if jee, ok := r.(*osutil.ExitError); ok {
 			fmt.Fprintln(os.Stderr, jee)
 			os.Exit(1)
 		} else {
diff --git a/client/go/internal/admin/vespa-wrapper/services/configproxy.go b/client/go/internal/admin/vespa-wrapper/services/configproxy.go
index e96ee38dcb5..bed6e980cf4 100644
--- a/client/go/internal/admin/vespa-wrapper/services/configproxy.go
+++ b/client/go/internal/admin/vespa-wrapper/services/configproxy.go
@@ -15,7 +15,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/jvm"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -30,9 +30,9 @@ func JustRunConfigproxy() int {
 	vespa.CheckCorrectUser()
 	configsources := defaults.VespaConfigserverRpcAddrs()
 	if len(configsources) < 1 {
-		util.ExitMsg("could not find any configservers")
+		osutil.ExitMsg("could not find any configservers")
 	}
-	util.TuneResourceLimits()
+	osutil.TuneResourceLimits()
 	c := jvm.NewConfigProxyJvm(PROXY_SERVICE_NAME)
 	userargs := os.Getenv(envvars.VESPA_CONFIGPROXY_JVMARGS)
 	c.ConfigureOptions(configsources, userargs)
@@ -68,7 +68,7 @@ func startProxyWithRunserver() {
 
 func waitForProxyResponse() bool {
 	hname, _ := vespa.FindOurHostname()
-	backtick := util.BackTicksWithStderr
+	backtick := osutil.BackTicksWithStderr
 	start := time.Now()
 	fmt.Printf("Waiting for config proxy to start\n")
 	for sleepcount := 0; sleepcount < 1800; sleepcount++ {
@@ -135,7 +135,7 @@ func StartConfigproxy() int {
 }
 
 func stopProxyWithRunserver() {
-	_, err := util.SystemCommand.Run("vespa-runserver",
+	_, err := osutil.SystemCommand.Run("vespa-runserver",
 		"-s", PROXY_SERVICE_NAME,
 		"-p", CONFIGPROXY_PIDFILE, "-S")
 	if err != nil {
diff --git a/client/go/internal/admin/vespa-wrapper/services/env.go b/client/go/internal/admin/vespa-wrapper/services/env.go
index 9a7ba40c73e..23cf80213d5 100644
--- a/client/go/internal/admin/vespa-wrapper/services/env.go
+++ b/client/go/internal/admin/vespa-wrapper/services/env.go
@@ -8,7 +8,7 @@ import (
 	"os"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 func exportSettings(vespaHome string) {
@@ -21,5 +21,5 @@ func exportSettings(vespaHome string) {
 	os.Setenv(envvars.JAVAVM_LD_PRELOAD, "")
 	os.Setenv(envvars.LD_PRELOAD, "")
 	os.Setenv(envvars.MALLOC_ARENA_MAX, "1")
-	util.OptionallyReduceTimerFrequency()
+	osutil.OptionallyReduceTimerFrequency()
 }
diff --git a/client/go/internal/admin/vespa-wrapper/services/prechecks.go b/client/go/internal/admin/vespa-wrapper/services/prechecks.go
index 5cba69a4824..93a53707ba2 100644
--- a/client/go/internal/admin/vespa-wrapper/services/prechecks.go
+++ b/client/go/internal/admin/vespa-wrapper/services/prechecks.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -31,7 +31,7 @@ func commonPreChecks() (veHome, veHost string) {
 	}
 	err = os.Chdir(veHome)
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	return
 }
diff --git a/client/go/internal/admin/vespa-wrapper/services/sentinel.go b/client/go/internal/admin/vespa-wrapper/services/sentinel.go
index 7694c930731..e489bf70ded 100644
--- a/client/go/internal/admin/vespa-wrapper/services/sentinel.go
+++ b/client/go/internal/admin/vespa-wrapper/services/sentinel.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -48,7 +48,7 @@ func startSentinelWithRunserver() {
 }
 
 func waitForSentinelPid() bool {
-	backtick := util.BackTicksWithStderr
+	backtick := osutil.BackTicksWithStderr
 	start := time.Now()
 	for sleepcount := 0; sleepcount < 1000; sleepcount++ {
 		time.Sleep(10 * time.Millisecond)
@@ -84,7 +84,7 @@ func StartConfigSentinel() int {
 }
 
 func stopSentinelWithRunserver() {
-	_, err := util.SystemCommand.Run("vespa-runserver",
+	_, err := osutil.SystemCommand.Run("vespa-runserver",
 		"-s", SENTINEL_SERVICE_NAME,
 		"-p", SENTINEL_PIDFILE, "-S")
 	if err != nil {
diff --git a/client/go/internal/admin/vespa-wrapper/services/start.go b/client/go/internal/admin/vespa-wrapper/services/start.go
index 408fc196fec..de658264669 100644
--- a/client/go/internal/admin/vespa-wrapper/services/start.go
+++ b/client/go/internal/admin/vespa-wrapper/services/start.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -33,14 +33,14 @@ func StartServices() int {
 }
 
 func checkjava() {
-	backticks := util.BackTicksWithStderr
+	backticks := osutil.BackTicksWithStderr
 	out, err := backticks.Run("java", "-version")
 	if err != nil {
 		trace.Warning("cannot run 'java -version'")
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	if !strings.Contains(out, "64-Bit Server VM") {
-		util.ExitErr(fmt.Errorf("java must invoke the 64-bit Java VM, but -version says:\n%s\n", out))
+		osutil.ExitErr(fmt.Errorf("java must invoke the 64-bit Java VM, but -version says:\n%s\n", out))
 	}
 }
 
@@ -53,7 +53,7 @@ func VespaStartServices() int {
 	trace.Debug("common prechecks ok, running in", home, "on", host)
 	vespa.RunPreStart()
 	trace.Debug("prestart ok")
-	util.TuneResourceLimits()
+	osutil.TuneResourceLimits()
 	increase_vm_max_map_count()
 	trace.Debug("resource limits ok")
 	checkjava()
@@ -64,7 +64,7 @@ func VespaStartServices() int {
 	drop_caches()
 	err := vespa.MaybeSwitchUser("start-services")
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	return StartServices()
 }
diff --git a/client/go/internal/admin/vespa-wrapper/services/stop.go b/client/go/internal/admin/vespa-wrapper/services/stop.go
index 9fd19e991a3..c4c4787c83a 100644
--- a/client/go/internal/admin/vespa-wrapper/services/stop.go
+++ b/client/go/internal/admin/vespa-wrapper/services/stop.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -21,11 +21,11 @@ func VespaStopServices() int {
 	}
 	err := vespa.LoadDefaultEnv()
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	err = vespa.MaybeSwitchUser("vespa-stop-services")
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	vespa.CheckCorrectUser()
 	trace.Debug("running as correct user")
diff --git a/client/go/internal/admin/vespa-wrapper/standalone/start.go b/client/go/internal/admin/vespa-wrapper/standalone/start.go
index 309e668b4d4..a3703ce930c 100644
--- a/client/go/internal/admin/vespa-wrapper/standalone/start.go
+++ b/client/go/internal/admin/vespa-wrapper/standalone/start.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/jvm"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -23,20 +23,20 @@ func commonPreChecks() {
 	veHome := vespa.FindAndVerifyVespaHome()
 	err := os.Chdir(veHome)
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	err = vespa.LoadDefaultEnv()
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 }
 
 func StartStandaloneContainer(extraArgs []string) int {
 	commonPreChecks()
-	util.TuneResourceLimits()
+	osutil.TuneResourceLimits()
 	serviceName := os.Getenv("VESPA_SERVICE_NAME")
 	if serviceName == "" {
-		util.ExitMsg("Missing service name, ensure VESPA_SERVICE_NAME is set in the environment")
+		osutil.ExitMsg("Missing service name, ensure VESPA_SERVICE_NAME is set in the environment")
 	}
 	c := jvm.NewStandaloneContainer(serviceName)
 	jvmOpts := c.JvmOptions()
diff --git a/client/go/internal/admin/vespa-wrapper/startcbinary/cmd.go b/client/go/internal/admin/vespa-wrapper/startcbinary/cmd.go
index 3cc20c43896..a35f0c5b820 100644
--- a/client/go/internal/admin/vespa-wrapper/startcbinary/cmd.go
+++ b/client/go/internal/admin/vespa-wrapper/startcbinary/cmd.go
@@ -10,7 +10,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 	"github.com/vespa-engine/vespa/client/go/internal/ioutil"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 	"github.com/vespa-engine/vespa/client/go/internal/vespa"
 )
 
@@ -23,7 +23,7 @@ func Run(args []string) int {
 	spec := NewProgSpec(args)
 	err := vespa.LoadDefaultEnv()
 	if err != nil {
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	hostname, err := vespa.FindOurHostname()
 	if err != nil {
diff --git a/client/go/internal/admin/vespa-wrapper/startcbinary/tuning.go b/client/go/internal/admin/vespa-wrapper/startcbinary/tuning.go
index 898e4558152..06c20021ff6 100644
--- a/client/go/internal/admin/vespa-wrapper/startcbinary/tuning.go
+++ b/client/go/internal/admin/vespa-wrapper/startcbinary/tuning.go
@@ -4,10 +4,10 @@
 package startcbinary
 
 import (
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 func configureTuning() {
-	util.OptionallyReduceTimerFrequency()
-	util.TuneResourceLimits()
+	osutil.OptionallyReduceTimerFrequency()
+	osutil.TuneResourceLimits()
 }
diff --git a/client/go/internal/util/execvp.go b/client/go/internal/osutil/execvp.go
index 418eb3d8f6c..331b8166428 100644
--- a/client/go/internal/util/execvp.go
+++ b/client/go/internal/osutil/execvp.go
@@ -3,7 +3,7 @@
 
 //go:build !windows
 
-package util
+package osutil
 
 import (
 	"fmt"
diff --git a/client/go/internal/util/execvp_windows.go b/client/go/internal/osutil/execvp_windows.go
index d01eda589ff..0e8e7a4a673 100644
--- a/client/go/internal/util/execvp_windows.go
+++ b/client/go/internal/osutil/execvp_windows.go
@@ -3,7 +3,7 @@
 
 //go:build windows
 
-package util
+package osutil
 
 import (
 	"fmt"
diff --git a/client/go/internal/util/fix_fs.go b/client/go/internal/osutil/fix_fs.go
index 9e09a2cbc32..837624cc05b 100644
--- a/client/go/internal/util/fix_fs.go
+++ b/client/go/internal/osutil/fix_fs.go
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Author: arnej
 
-package util
+package osutil
 
 import (
 	"errors"
diff --git a/client/go/internal/util/fix_fs_test.go b/client/go/internal/osutil/fix_fs_test.go
index e6a87d10717..792986d7996 100644
--- a/client/go/internal/util/fix_fs_test.go
+++ b/client/go/internal/osutil/fix_fs_test.go
@@ -1,5 +1,5 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package util
+package osutil
 
 import (
 	"os"
diff --git a/client/go/internal/util/just_exit.go b/client/go/internal/osutil/just_exit.go
index 6be0df0f30f..5ad85ec9ceb 100644
--- a/client/go/internal/util/just_exit.go
+++ b/client/go/internal/osutil/just_exit.go
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Author: arnej
 
-package util
+package osutil
 
 import (
 	"fmt"
diff --git a/client/go/internal/util/run_cmd.go b/client/go/internal/osutil/run_cmd.go
index cc40f86154c..ca0d621f9f9 100644
--- a/client/go/internal/util/run_cmd.go
+++ b/client/go/internal/osutil/run_cmd.go
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Author: arnej
 
-package util
+package osutil
 
 import (
 	"bytes"
diff --git a/client/go/internal/util/setrlimit.go b/client/go/internal/osutil/setrlimit.go
index 1a96d260fcb..6bc6d68af3e 100644
--- a/client/go/internal/util/setrlimit.go
+++ b/client/go/internal/osutil/setrlimit.go
@@ -2,7 +2,7 @@
 
 //go:build !windows
 
-package util
+package osutil
 
 import (
 	"os"
diff --git a/client/go/internal/util/setrlimit_windows.go b/client/go/internal/osutil/setrlimit_windows.go
index f2993c7af13..e61233ba9e6 100644
--- a/client/go/internal/util/setrlimit_windows.go
+++ b/client/go/internal/osutil/setrlimit_windows.go
@@ -2,7 +2,7 @@
 
 //go:build windows
 
-package util
+package osutil
 
 type ResourceId int
 
diff --git a/client/go/internal/util/tune_logctl.go b/client/go/internal/osutil/tune_logctl.go
index b66c14c2d65..f68259170c7 100644
--- a/client/go/internal/util/tune_logctl.go
+++ b/client/go/internal/osutil/tune_logctl.go
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Author: arnej
 
-package util
+package osutil
 
 func TuneLogging(serviceName, component, settings string) bool {
 	arg := serviceName
diff --git a/client/go/internal/util/tuning.go b/client/go/internal/osutil/tuning.go
index cca314247ab..8e9b894e8ae 100644
--- a/client/go/internal/util/tuning.go
+++ b/client/go/internal/osutil/tuning.go
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Author: arnej
 
-package util
+package osutil
 
 import (
 	"os"
diff --git a/client/go/internal/vespa/detect_hostname.go b/client/go/internal/vespa/detect_hostname.go
index e6b2d113ec1..062d83d66a4 100644
--- a/client/go/internal/vespa/detect_hostname.go
+++ b/client/go/internal/vespa/detect_hostname.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 // detect if this host is IPv6-only, in which case we want to pass
@@ -109,7 +109,7 @@ func findOurHostnameFrom(name string) (string, error) {
 	if good {
 		return trimmed, nil
 	}
-	backticks := util.BackTicksIgnoreStderr
+	backticks := osutil.BackTicksIgnoreStderr
 	out, err := backticks.Run("vespa-detect-hostname")
 	if err != nil {
 		out, err = backticks.Run("hostname", "-f")
diff --git a/client/go/internal/vespa/find_home.go b/client/go/internal/vespa/find_home.go
index e1ee776eb45..3545ce6a8c7 100644
--- a/client/go/internal/vespa/find_home.go
+++ b/client/go/internal/vespa/find_home.go
@@ -12,7 +12,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 	"github.com/vespa-engine/vespa/client/go/internal/ioutil"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 const (
@@ -85,7 +85,7 @@ func FindAndVerifyVespaHome() string {
 	myself := fmt.Sprintf("%s/%s", vespaHome, scriptUtilsFilename)
 	if !ioutil.IsExecutable(myself) {
 		trace.Warning("missing or bad file:", myself)
-		util.ExitMsg("Not a valid VESPA_HOME: " + vespaHome)
+		osutil.ExitMsg("Not a valid VESPA_HOME: " + vespaHome)
 	}
 	return vespaHome
 }
diff --git a/client/go/internal/vespa/load_env.go b/client/go/internal/vespa/load_env.go
index 31a91ef39de..a799cbf4f9a 100644
--- a/client/go/internal/vespa/load_env.go
+++ b/client/go/internal/vespa/load_env.go
@@ -15,7 +15,7 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 	"github.com/vespa-engine/vespa/client/go/internal/ioutil"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 const (
@@ -249,7 +249,7 @@ func shellQuote(s string) string {
 	}
 	if i != l {
 		err := fmt.Errorf("expected length %d but was %d", l, i)
-		util.ExitErr(err)
+		osutil.ExitErr(err)
 	}
 	return string(res)
 }
diff --git a/client/go/internal/vespa/prestart.go b/client/go/internal/vespa/prestart.go
index 6fe6d50b1fe..e6932e951ad 100644
--- a/client/go/internal/vespa/prestart.go
+++ b/client/go/internal/vespa/prestart.go
@@ -8,7 +8,7 @@ import (
 	"os"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 func RunPreStart() error {
@@ -23,7 +23,7 @@ func RunPreStart() error {
 		return err
 	}
 	vespaUid, vespaGid := FindVespaUidAndGid()
-	fixSpec := util.FixSpec{
+	fixSpec := osutil.FixSpec{
 		UserId:   vespaUid,
 		GroupId:  vespaGid,
 		DirMode:  0755,
@@ -57,7 +57,7 @@ func RunPreStart() error {
 	// fix wrong ownerships within directories:
 	var fixer fs.WalkDirFunc = func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
-			util.ExitErr(err)
+			osutil.ExitErr(err)
 		}
 		if d.IsDir() {
 			fixSpec.FixDir(path)
diff --git a/client/go/internal/vespa/switch_user.go b/client/go/internal/vespa/switch_user.go
index 096ba85b375..bce59b96f32 100644
--- a/client/go/internal/vespa/switch_user.go
+++ b/client/go/internal/vespa/switch_user.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
-	"github.com/vespa-engine/vespa/client/go/internal/util"
+	"github.com/vespa-engine/vespa/client/go/internal/osutil"
 )
 
 const ENV_CHECK = envvars.VESPA_ALREADY_SWITCHED_USER_TO
@@ -55,7 +55,7 @@ func CheckCorrectUser() {
 	if err2 != nil {
 		trace.Warning("note: user.Lookup(", vespaUser, ") failed:", err2)
 	}
-	util.ExitMsg("running as wrong user. Check your VESPA_USER setting")
+	osutil.ExitMsg("running as wrong user. Check your VESPA_USER setting")
 }
 
 // re-execute a vespa-wrapper action after switching to the vespa user
@@ -87,7 +87,7 @@ func MaybeSwitchUser(action string) error {
 		mySelf := fmt.Sprintf("%s/%s", vespaHome, scriptUtilsFilename)
 		os.Setenv(ENV_CHECK, wantUser.Username)
 		args := []string{SU_PROG, mySelf, action}
-		return util.Execvp(SU_PROG, args)
+		return osutil.Execvp(SU_PROG, args)
 	}
 	return nil
 }