summaryrefslogtreecommitdiff
path: root/libvirt/utils_domain_def.go
diff options
context:
space:
mode:
authorFlavio Castelli <fcastelli@suse.com>2018-02-20 09:37:39 +0100
committerFlavio Castelli <flavio@castelli.me>2018-02-20 16:38:08 +0100
commit09834dbcf6d3353850cea0f51b4b07d811d3628d (patch)
tree9bfe565a07dc29066c24159911dd6d5bebfe5a28 /libvirt/utils_domain_def.go
parente456355639d72af6ff2da2acd30ec3e914bdd996 (diff)
downloadterraform-provider-libvirt-09834dbcf6d3353850cea0f51b4b07d811d3628d.tar
terraform-provider-libvirt-09834dbcf6d3353850cea0f51b4b07d811d3628d.tar.gz
Handle keyword-less kernel params
Allow kernel params that don't have a key/value structure to be handled. Signed-off-by: Flavio Castelli <fcastelli@suse.com>
Diffstat (limited to 'libvirt/utils_domain_def.go')
-rw-r--r--libvirt/utils_domain_def.go13
1 files changed, 13 insertions, 0 deletions
diff --git a/libvirt/utils_domain_def.go b/libvirt/utils_domain_def.go
index 40d31a09..90175de1 100644
--- a/libvirt/utils_domain_def.go
+++ b/libvirt/utils_domain_def.go
@@ -60,8 +60,16 @@ func splitKernelCmdLine(cmdLine string) ([]map[string]string, error) {
}
currCmdLine := make(map[string]string)
+ keylessCmdLineArgs := []string{}
+
argVals := strings.Split(cmdLine, " ")
for _, argVal := range argVals {
+ if !strings.Contains(argVal, "=") {
+ // keyless cmd line (eg: nosplash)
+ keylessCmdLineArgs = append(keylessCmdLineArgs, argVal)
+ continue
+ }
+
kv := strings.Split(argVal, "=")
if len(kv) != 2 {
return nil, fmt.Errorf("Can't parse kernel command line: '%s'", cmdLine)
@@ -77,5 +85,10 @@ func splitKernelCmdLine(cmdLine string) ([]map[string]string, error) {
if len(currCmdLine) > 0 {
cmdLines = append(cmdLines, currCmdLine)
}
+ if len(keylessCmdLineArgs) > 0 {
+ cl := make(map[string]string)
+ cl["_"] = strings.Join(keylessCmdLineArgs, " ")
+ cmdLines = append(cmdLines, cl)
+ }
return cmdLines, nil
}