refactor(bootstrap): always using bootstrap to exec cmdline

Author: ihexon

cmd/bootstrap/bootstrap.go

@@ -6,6 +6,8 @@ import (
 	"golang.org/x/sync/errgroup"
 	"linuxvm/pkg/filesystem"
 	"linuxvm/pkg/network"
+	"os"
+	"os/exec"
 )
 
 const (
@@ -15,21 +17,41 @@ const (
 )
 
 func main() {
-	g, _ := errgroup.WithContext(context.Background())
+	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 {
 		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

@@ -78,8 +78,8 @@ func CreateVM(ctx context.Context, command *cli.Command) error {
 
 	cmdline := vmconfig.Cmdline{
 		Workspace:     "/",
-		TargetBin:     command.Args().First(),
-		TargetBinArgs: command.Args().Tail(),
+		TargetBin:     "/bootstrap-arm64",
+		TargetBinArgs: append([]string{command.Args().First()}, command.Args().Tail()...),
 		Env:           command.StringSlice("envs"),
 	}
 
@@ -90,7 +90,7 @@ func CreateVM(ctx context.Context, command *cli.Command) error {
 	logrus.Infof("set network backend: %q", vmc.NetworkStackBackend)
 	logrus.Infof("set envs: %v", cmdline.Env)
 	logrus.Infof("set data disk: %v", vmc.DataDisk)
-	logrus.Infof("set cmdline: %v, %v", cmdline.TargetBin, cmdline.TargetBinArgs)
+	logrus.Infof("set cmdline: %q, %q", cmdline.TargetBin, cmdline.TargetBinArgs)
 
 	err = system.CopyBootstrapInToRootFS(vmc.RootFS)
 	if err != nil {