diff --git a/internal/app/wwctl/node/console/main.go b/internal/app/wwctl/node/console/main.go index 0f150e31..368eb0ce 100644 --- a/internal/app/wwctl/node/console/main.go +++ b/internal/app/wwctl/node/console/main.go @@ -39,19 +39,16 @@ func CobraRunE(cmd *cobra.Command, args []string) error { } for _, node := range nodes { - - if node.Ipmi.Ipaddr.IsUnspecified() { + if node.Ipmi == nil || node.Ipmi.Ipaddr == nil || node.Ipmi.Ipaddr.IsUnspecified() { wwlog.Error("%s: No IPMI IP address", node.Id()) continue } ipmiCmd := power.IPMI{IpmiConf: *node.Ipmi} - err := ipmiCmd.Console() - if err != nil { + if err := ipmiCmd.Console(); err != nil { wwlog.Error("%s: Console problem", node.Id()) returnErr = err continue } - } return returnErr diff --git a/internal/app/wwctl/node/export/main.go b/internal/app/wwctl/node/export/main.go index e68c93a8..ce84b1d0 100644 --- a/internal/app/wwctl/node/export/main.go +++ b/internal/app/wwctl/node/export/main.go @@ -4,10 +4,12 @@ import ( "github.com/spf13/cobra" apinode "github.com/warewulf/warewulf/internal/pkg/api/node" "github.com/warewulf/warewulf/internal/pkg/api/routes/wwapiv1" + "github.com/warewulf/warewulf/internal/pkg/hostlist" "github.com/warewulf/warewulf/internal/pkg/wwlog" ) func CobraRunE(cmd *cobra.Command, args []string) error { + args = hostlist.Expand(args) filterList := wwapiv1.NodeList{ Output: args, } diff --git a/internal/app/wwctl/node/sensors/main.go b/internal/app/wwctl/node/sensors/main.go index c565f0aa..c7e71411 100644 --- a/internal/app/wwctl/node/sensors/main.go +++ b/internal/app/wwctl/node/sensors/main.go @@ -47,7 +47,7 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err results := make(chan power.IPMI, jobcount) for _, node := range nodes { - if node.Ipmi.Ipaddr.IsUnspecified() { + if node.Ipmi == nil || node.Ipmi.Ipaddr == nil || node.Ipmi.Ipaddr.IsUnspecified() { wwlog.Error("%s: No IPMI IP address", node.Id()) continue }