add "extraArchive" config option

Author: pendo324

cmd/limactl/hostagent.go

@@ -28,6 +28,7 @@ func newHostagentCommand() *cobra.Command {
 	hostagentCommand.Flags().StringP("pidfile", "p", "", "write pid to file")
 	hostagentCommand.Flags().String("socket", "", "hostagent socket")
 	hostagentCommand.Flags().String("nerdctl-archive", "", "local file path (not URL) of nerdctl-full-VERSION-linux-GOARCH.tar.gz")
+	hostagentCommand.Flags().String("extra-archive", "", "local file path (not URL) of an arbitrary archive")
 	return hostagentCommand
 }
 
@@ -70,6 +71,13 @@ func hostagentAction(cmd *cobra.Command, args []string) error {
 	if nerdctlArchive != "" {
 		opts = append(opts, hostagent.WithNerdctlArchive(nerdctlArchive))
 	}
+	extraArchive, err := cmd.Flags().GetString("extra-archive")
+	if err != nil {
+		return err
+	}
+	if extraArchive != "" {
+		opts = append(opts, hostagent.WithExtraArchive(extraArchive))
+	}
 	ha, err := hostagent.New(instName, stdout, sigintCh, opts...)
 	if err != nil {
 		return err

examples/default.yaml

@@ -196,6 +196,13 @@ containerd:
 #     vim was not installed in the guest. Make sure the package system is working correctly.
 #     Also see "/var/log/cloud-init-output.log" in the guest.
 
+# Adds an additional archive to the CIDATA image which is mounted on boot
+# Useful for provisioning scripts that run before mounts
+# extraArchive: 
+#   location: "~/extra.tar.gz"
+#   arch: "x86_64"
+#   digest: "sha256:..."
+
 # ===================================================================== #
 # FURTHER ADVANCED CONFIGURATION
 # ===================================================================== #

pkg/cidata/cidata.go

@@ -104,7 +104,7 @@ func setupEnv(y *limayaml.LimaYAML) (map[string]string, error) {
 	return env, nil
 }
 
-func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort, tcpDNSLocalPort int, nerdctlArchive string) error {
+func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort, tcpDNSLocalPort int, nerdctlArchive, extraArchive string) error {
 	if err := limayaml.Validate(*y, false); err != nil {
 		return err
 	}
@@ -287,6 +287,19 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort
 		})
 	}
 
+	if extraArchive != "" {
+		extratgzR, err := os.Open(extraArchive)
+		if err != nil {
+			return err
+		}
+		defer extratgzR.Close()
+		layout = append(layout, iso9660util.Entry{
+			// ISO9660 requires len(Path) <= 30
+			Path:   "extra.tgz",
+			Reader: extratgzR,
+		})
+	}
+
 	return iso9660util.Write(filepath.Join(instDir, filenames.CIDataISO), "cidata", layout)
 }
 

pkg/hostagent/hostagent.go

@@ -58,6 +58,7 @@ type HostAgent struct {
 
 type options struct {
 	nerdctlArchive string // local path, not URL
+	extraArchive   string // local path, not URL
 }
 
 type Opt func(*options) error
@@ -69,6 +70,13 @@ func WithNerdctlArchive(s string) Opt {
 	}
 }
 
+func WithExtraArchive(s string) Opt {
+	return func(o *options) error {
+		o.extraArchive = s
+		return nil
+	}
+}
+
 // New creates the HostAgent.
 //
 // stdout is for emitting JSON lines of Events.
@@ -107,7 +115,7 @@ func New(instName string, stdout io.Writer, sigintCh chan os.Signal, opts ...Opt
 		}
 	}
 
-	if err := cidata.GenerateISO9660(inst.Dir, instName, y, udpDNSLocalPort, tcpDNSLocalPort, o.nerdctlArchive); err != nil {
+	if err := cidata.GenerateISO9660(inst.Dir, instName, y, udpDNSLocalPort, tcpDNSLocalPort, o.nerdctlArchive, o.extraArchive); err != nil {
 		return nil, err
 	}
 

pkg/limayaml/limayaml.go

@@ -31,6 +31,7 @@ type LimaYAML struct {
 	UseHostResolver   *bool             `yaml:"useHostResolver,omitempty" json:"useHostResolver,omitempty"` // DEPRECATED, use `HostResolver.Enabled` instead
 	PropagateProxyEnv *bool             `yaml:"propagateProxyEnv,omitempty" json:"propagateProxyEnv,omitempty"`
 	CACertificates    CACertificates    `yaml:"caCerts,omitempty" json:"caCerts,omitempty"`
+	ExtraArchive      *File             `yaml:"extraArchive,omitempty" json:"extraArchive,omitempty"`
 }
 
 type Arch = string

pkg/start/start.go

@@ -132,6 +132,29 @@ func Start(ctx context.Context, inst *store.Instance) error {
 	if nerdctlArchiveCache != "" {
 		args = append(args, "--nerdctl-archive", nerdctlArchiveCache)
 	}
+	if y.ExtraArchive != nil {
+		if y.ExtraArchive.Digest.String() != "" {
+			if !y.ExtraArchive.Digest.Algorithm().Available() {
+				return fmt.Errorf("expected digest algorithm %q is not available", y.ExtraArchive.Digest.Algorithm())
+			}
+			if err := y.ExtraArchive.Digest.Validate(); err != nil {
+				return err
+			}
+			eaBuf, err := os.ReadFile(y.ExtraArchive.Location)
+			if err != nil {
+				return err
+			}
+			verifier := y.ExtraArchive.Digest.Verifier()
+			if _, err := verifier.Write(eaBuf); err != nil {
+				return err
+			}
+			if !verifier.Verified() {
+				return errors.New("digest mismatch between supplied digest and calculated digest for extra archive")
+			}
+		}
+
+		args = append(args, "--extra-archive", y.ExtraArchive.Location)
+	}
 	args = append(args, inst.Name)
 	haCmd := exec.CommandContext(ctx, self, args...)