Merge pull request #1 from ihexon/main

merge ihexon/main branch

Author: ihexon

.github/workflows/build.yml

@@ -1,3 +1,6 @@
+permissions:
+  contents: write
+
 name: build.yml
 on:
   push:

cmd/bootstrap/bootstrap.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sync/errgroup"
+	"linuxvm/pkg/filesystem"
 	"linuxvm/pkg/network"
 	"os"
 	"os/exec"
@@ -18,33 +19,39 @@ const (
 func main() {
 	g, ctx := errgroup.WithContext(context.Background())
 	g.Go(func() error {
-		err := network.DHClient4(eth0, attempts, verbose)
-		if err != nil {
-			logrus.Errorf("failed to get dhcp config: %v", err)
-			return err
-		}
-		return nil
+		return configureNetwork()
 	})
 
-	//g.Go(func() error {
-	//	cmd := exec.CommandContext(ctx, os.Args[1], os.Args[2:]...)
-	//	cmd.Stdout = os.Stdout
-	//	cmd.Stderr = os.Stderr
-	//	cmd.Stdin = os.Stdin
-	//	logrus.Infof("%q", cmd.Args)
-	//	return cmd.Run()
-	//})
-	
 	g.Go(func() error {
-		cmd := exec.CommandContext(ctx, "/bin/mount", "-o", "bind", "/dev/shm", "/tmp")
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		cmd.Stdin = os.Stdin
-		logrus.Infof("%q", cmd.Args)
-		return cmd.Run()
+		return filesystem.MountTmpfs()
+	})
+
+	g.Go(func() error {
+		return doExecCmdLine(ctx, os.Args[1], os.Args[2:])
 	})
 
 	if err := g.Wait(); err != nil {
 		logrus.Errorf("failed to run cmd: %v", err)
 	}
 }
+
+func doExecCmdLine(ctx context.Context, targetBin string, targetBinArgs []string) error {
+	cmd := exec.CommandContext(ctx, targetBin, targetBinArgs...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Stdin = os.Stdin
+	logrus.Infof("cmdline: %q", cmd.Args)
+	if err := cmd.Run(); err != nil {
+		logrus.Errorf("failed to run cmd: %v", err)
+		return err
+	}
+	return nil
+}
+
+func configureNetwork() error {
+	if err := network.DHClient4(eth0, attempts, verbose); err != nil {
+		logrus.Errorf("failed to get dhcp config: %v", err)
+		return err
+	}
+	return nil
+}

cmd/main.go

@@ -41,7 +41,7 @@ func main() {
 				Name:  "envs",
 				Usage: "set envs for cmdline, e.g. --envs=FOO=bar --envs=BAZ=qux",
 			},
-			&cli.StringFlag{
+			&cli.StringSliceFlag{
 				Name:  "data-disk",
 				Usage: "set data disk path, the disk will be map into /dev/vdX",
 			},
@@ -61,11 +61,11 @@ func CreateVM(ctx context.Context, command *cli.Command) error {
 		return err
 	}
 
-	vmc := &vmconfig.VMConfig{
+	vmc := vmconfig.VMConfig{
 		MemoryInMB: command.Int32("memory"),
 		Cpus:       command.Int8("cpus"),
 		RootFS:     command.String("rootfs"),
-		DataDisk:   command.String("data-disk"),
+		DataDisk:   command.StringSlice("data-disk"),
 	}
 
 	tmpdir, err := os.MkdirTemp("", "gvproxy")
@@ -76,9 +76,10 @@ func CreateVM(ctx context.Context, command *cli.Command) error {
 	vmc.GVproxyEndpoint = fmt.Sprintf("unix://%s/gvproxy-control.sock", tmpdir)
 	vmc.NetworkStackBackend = fmt.Sprintf("unixgram://%s/vfkit-network-backend.sock", tmpdir)
 
-	cmdline := &vmconfig.Cmdline{
-		TargetBin:     command.Args().First(),
-		TargetBinArgs: command.Args().Tail(),
+	cmdline := vmconfig.Cmdline{
+		Workspace:     "/",
+		TargetBin:     "/bootstrap-arm64",
+		TargetBinArgs: append([]string{command.Args().First()}, command.Args().Tail()...),
 		Env:           command.StringSlice("envs"),
 	}
 
@@ -88,7 +89,8 @@ func CreateVM(ctx context.Context, command *cli.Command) error {
 	logrus.Infof("set gvproxy control: %q", vmc.GVproxyEndpoint)
 	logrus.Infof("set network backend: %q", vmc.NetworkStackBackend)
 	logrus.Infof("set envs: %v", cmdline.Env)
-	logrus.Infof("run cmdline: %v, %v", cmdline.TargetBin, cmdline.TargetBinArgs)
+	logrus.Infof("set data disk: %v", vmc.DataDisk)
+	logrus.Infof("set cmdline: %q, %q", cmdline.TargetBin, cmdline.TargetBinArgs)
 
 	err = system.CopyBootstrapInToRootFS(vmc.RootFS)
 	if err != nil {
@@ -102,7 +104,7 @@ func CreateVM(ctx context.Context, command *cli.Command) error {
 	})
 
 	g.Go(func() error {
-		return libkrun.CreateVM(ctx, vmc, cmdline, libkrun.INFO)
+		return libkrun.StartVM(ctx, vmc, cmdline)
 	})
 
 	return g.Wait()

go.mod

@@ -3,8 +3,9 @@ module linuxvm
 go 1.24
 
 require (
-	github.com/diskfs/go-diskfs v1.6.1-0.20250518130040-b3152784dab9
 	github.com/google/uuid v1.6.0
+	github.com/moby/sys/mount v0.3.5-0.20240721113140-2c9636d9130c
+	github.com/moby/sys/mountinfo v0.7.2
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.4-0.20241118143825-d1e633264448
 	github.com/urfave/cli/v3 v3.3.3-0.20250428204840-66d871f8b5bf
@@ -13,15 +14,10 @@ require (
 )
 
 require (
-	github.com/djherbis/times v1.6.0 // indirect
-	github.com/elliotwutingfeng/asciiset v0.0.0-20240214025120-24af97c84155 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/jsimonetti/rtnetlink v1.3.5 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/mdlayher/netlink v1.7.2 // indirect
-	github.com/pkg/xattr v0.4.10 // indirect
-	github.com/ulikunitz/xz v0.5.12 // indirect
 	gvisor.dev/gvisor v0.0.0-20240916094835-a174eb65023f // indirect
 )