Don't generate cidata.iso for external vm

afbjorklund · afbjorklund · commit b7a6efaf42d9 · 2024-11-06T08:53:09.000+01:00
It is not using cloud-init anyway, and does not need
another copy of lima-guestagent and nerdctl-full.tgz

Signed-off-by: Anders F Björklund &lt;anders.f.bjorklund@gmail.com&gt;
diff --git a/pkg/hostagent/hostagent.go b/pkg/hostagent/hostagent.go
@@ -138,8 +138,10 @@ func New(instName string, stdout io.Writer, signalCh chan os.Signal, opts ...Opt
 	if err := cidata.GenerateCloudConfig(inst.Dir, instName, inst.Config); err != nil {
 		return nil, err
 	}
-	if err := cidata.GenerateISO9660(inst.Dir, instName, inst.Config, udpDNSLocalPort, tcpDNSLocalPort, o.nerdctlArchive, vSockPort, virtioPort); err != nil {
-		return nil, err
+	if *inst.Config.VMType != limayaml.EXT {
+		if err := cidata.GenerateISO9660(inst.Dir, instName, inst.Config, udpDNSLocalPort, tcpDNSLocalPort, o.nerdctlArchive, vSockPort, virtioPort); err != nil {
+			return nil, err
+		}
 	}
 
 	sshOpts, err := sshutil.SSHOpts(

Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,10 @@ func New(instName string, stdout io.Writer, signalCh chan os.Signal, opts ...Opt`
`138`	`138`	`if err := cidata.GenerateCloudConfig(inst.Dir, instName, inst.Config); err != nil {`
`139`	`139`	`return nil, err`
`140`	`140`	`}`
`141`		`- if err := cidata.GenerateISO9660(inst.Dir, instName, inst.Config, udpDNSLocalPort, tcpDNSLocalPort, o.nerdctlArchive, vSockPort, virtioPort); err != nil {`
`142`		`- return nil, err`
	`141`	`+ if *inst.Config.VMType != limayaml.EXT {`
	`142`	`+ if err := cidata.GenerateISO9660(inst.Dir, instName, inst.Config, udpDNSLocalPort, tcpDNSLocalPort, o.nerdctlArchive, vSockPort, virtioPort); err != nil {`
	`143`	`+ return nil, err`
	`144`	`+ }`
`143`	`145`	`}`
`144`	`146`
`145`	`147`	`sshOpts, err := sshutil.SSHOpts(`