Skip to content

Commit

Permalink
Use /usr/local/bin on CoreOS (#459)
Browse files Browse the repository at this point in the history
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
  • Loading branch information
kke committed Feb 7, 2023
1 parent 06f6efb commit c76ebf9
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions configurer/linux/coreos.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ package linux

import (
"errors"
"strings"

"github.com/k0sproject/k0sctl/configurer"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/os/registry"
"strings"
)

// CoreOS provides OS support for ostree based Fedora & RHEL systems
Expand All @@ -18,7 +19,7 @@ type CoreOS struct {
func init() {
registry.RegisterOSModule(
func(os rig.OSVersion) bool {
return os.ID == "fedora" && strings.Contains(os.Name, "CoreOS") || os.ID == "rhel" && strings.Contains(os.Name, "CoreOS")
return strings.Contains(os.Name, "CoreOS") && (os.ID == "fedora" || os.ID == "rhel")
},
func() interface{} {
linuxType := &CoreOS{}
Expand All @@ -31,7 +32,3 @@ func init() {
func (l CoreOS) InstallPackage(h os.Host, pkg ...string) error {
return errors.New("CoreOS does not support installing packages manually")
}

func (l CoreOS) K0sBinaryPath() string {
return "/opt/bin/k0s"
}

0 comments on commit c76ebf9

Please sign in to comment.