Don't generate cidata.iso for external vm

afbjorklund · afbjorklund · commit 7b2e56dd31ab · 2024-01-19T17:36:13.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
@@ -133,8 +133,10 @@ func New(instName string, stdout io.Writer, signalCh chan os.Signal, opts ...Opt
 		virtioPort = "" // filenames.VirtioPort
 	}
 
-	if err := cidata.GenerateISO9660(inst.Dir, instName, y, udpDNSLocalPort, tcpDNSLocalPort, o.nerdctlArchive, vSockPort, virtioPort); err != nil {
-		return nil, err
+	if *y.VMType != limayaml.EXT {
+		if err := cidata.GenerateISO9660(inst.Dir, instName, y, udpDNSLocalPort, tcpDNSLocalPort, o.nerdctlArchive, vSockPort, virtioPort); err != nil {
+			return nil, err
+		}
 	}
 
 	sshOpts, err := sshutil.SSHOpts(inst.Dir, *y.SSH.LoadDotSSHPubKeys, *y.SSH.Address, *y.SSH.ForwardAgent, *y.SSH.ForwardX11, *y.SSH.ForwardX11Trusted)

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,10 @@ func New(instName string, stdout io.Writer, signalCh chan os.Signal, opts ...Opt`
`133`	`133`	`virtioPort = "" // filenames.VirtioPort`
`134`	`134`	`}`
`135`	`135`
`136`		`- if err := cidata.GenerateISO9660(inst.Dir, instName, y, udpDNSLocalPort, tcpDNSLocalPort, o.nerdctlArchive, vSockPort, virtioPort); err != nil {`
`137`		`- return nil, err`
	`136`	`+ if *y.VMType != limayaml.EXT {`
	`137`	`+ if err := cidata.GenerateISO9660(inst.Dir, instName, y, udpDNSLocalPort, tcpDNSLocalPort, o.nerdctlArchive, vSockPort, virtioPort); err != nil {`
	`138`	`+ return nil, err`
	`139`	`+ }`
`138`	`140`	`}`
`139`	`141`
`140`	`142`	`sshOpts, err := sshutil.SSHOpts(inst.Dir, y.SSH.LoadDotSSHPubKeys, y.SSH.Address, y.SSH.ForwardAgent, y.SSH.ForwardX11, *y.SSH.ForwardX11Trusted)`