diff options
| author | Jeff Carr <[email protected]> | 2024-11-01 06:21:14 -0500 | 
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2024-11-01 06:21:14 -0500 | 
| commit | 62bb5dbb9f639638d3809abade10e85888a4cb48 (patch) | |
| tree | 5b056fc5805fe6c90e8fdfde4e4d257b3f4c2390 | |
| parent | 71fc48cbc2a1e3b8518cea2b19d508a1e12f0755 (diff) | |
closer
Signed-off-by: Jeff Carr <[email protected]>
| -rw-r--r-- | start.go | 10 | 
1 files changed, 5 insertions, 5 deletions
@@ -19,22 +19,22 @@ func newStart(start string, d *pb.Droplet) error {  	log.Info("start droplet here:", d.Hostname)  	domcfg := &libvirtxml.Domain{} -	mergeXML(domcfg, "standard.x86") +	mergeXMLresource(domcfg, "standard.x86")  	// ignore spice if it's not set  	if d.SpicePort == 0 {  		log.Info("spice port was not set. spice disabled")  	} else { -		mergeXML(domcfg, "spice") +		mergeXMLresource(domcfg, "spice")  		if err := virtigolib.SetSpicePort(d, domcfg); err != nil {  			return err  		}  	} -	mergeXML(domcfg, "qcow") +	mergeXMLresource(domcfg, "qcow")  	return virtigolib.GenerateDropletXml(me.dirs, d, domcfg, start)  } -func mergeXML(domcfg *libvirtxml.Domain, filename string) error { +func mergeXMLresource(domcfg *libvirtxml.Domain, filename string) error {  	fullname := "resources/xml/" + filename + ".xml"  	pfile, err := resources.ReadFile(fullname)  	if err != nil { @@ -42,5 +42,5 @@ func mergeXML(domcfg *libvirtxml.Domain, filename string) error {  		return err  	} -	return virtigolib.AddDefaultXml(domcfg, string(pfile)) +	return virtigolib.MergeXml(domcfg, string(pfile))  }  | 
