kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

added excludellist to CreateFlags

Browse Source
This commit is contained in:
Christian Goll
2022-07-14 10:40:46 +02:00
parent e0c62a81a4
commit 510f6a60a9
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/app/wwctl/profile/set/root.go
View File

@@ -1,7 +1,6 @@
package set
import (
"fmt"
"log"
"github.com/hpcng/warewulf/internal/pkg/container"
@@ -46,15 +45,9 @@ func init() {
var emptyNodeConf node.NodeConf
emptyNodeConf.Kernel = new(node.KernelConf)
emptyNodeConf.Ipmi = new(node.IpmiConf)
OptionStrMap = myBase.CreateFlags(emptyNodeConf, []string{})
fmt.Println(baseCmd.Flags().Args())
flag := baseCmd.Flag("ipaddr")
if flag != nil {
flag.Name = "donotuse"
flag.Usage = "FooBaar"
} else {
fmt.Println("Flag not found")
}
OptionStrMap = myBase.CreateFlags(emptyNodeConf,
[]string{"ipaddr", "ipaddr6", "ipmiaddr", "profile"})
baseCmd.PersistentFlags().StringVarP(&SetNetDevDel, "netdel", "D", "", "Delete the node's network device")
baseCmd.PersistentFlags().BoolVarP(&SetNodeAll, "all", "a", false, "Set all nodes")
baseCmd.PersistentFlags().BoolVarP(&SetYes, "yes", "y", false, "Set 'yes' to all questions asked")

4
internal/pkg/node/methods.go
View File

@@ -559,7 +559,7 @@ func (baseCmd *CobraCommand) CreateFlags(theStruct interface{}, excludeList []st
wwlog.Warn("handling of %v not implemented\n", field.Type)
}
} else if field.Tag.Get("comment") != "" && !util.InSlice(excludeList, field.Name) {
} else if field.Tag.Get("comment") != "" && !util.InSlice(excludeList, field.Tag.Get("lopt")) {
var newStr string
optionsMap[field.Name] = &newStr
if field.Tag.Get("sopt") != "" {
@@ -568,7 +568,7 @@ func (baseCmd *CobraCommand) CreateFlags(theStruct interface{}, excludeList []st
field.Tag.Get("sopt"),
field.Tag.Get("default"),
field.Tag.Get("comment"))
} else if !util.InSlice(excludeList, field.Name) {
} else if !util.InSlice(excludeList, field.Tag.Get("lopt")) {
baseCmd.PersistentFlags().StringVar(&newStr,
field.Tag.Get("lopt"),
field.Tag.Get("default"),