summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2021-05-15 15:07:44 -0700
committerFranck Cuny <franck@fcuny.net>2021-05-15 15:07:44 -0700
commit376a46af80ed8d196e434ef2599f72690f2ccf67 (patch)
treeed8ccfb73cc2998eef78e437789ab947c8b31ffe
parentc2vm: fix kernel boot options (diff)
downloadcontainerd-to-vm-376a46af80ed8d196e434ef2599f72690f2ccf67.tar.gz
rename the variable for the linux kernel
-rw-r--r--cmd/c2vm/main.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/cmd/c2vm/main.go b/cmd/c2vm/main.go
index 9b7567e..66f881b 100644
--- a/cmd/c2vm/main.go
+++ b/cmd/c2vm/main.go
@@ -41,9 +41,9 @@ var (
 func main() {
 	var (
 		containerName     = flag.String("container", "", "Name of the container")
-		outFile           = flag.String("out", "container.img", "firecracker output to create")
-		linuxKernel       = flag.String("linux-kernel", "", "path to the linux kernel to use")
-		firecrackerBinary = flag.String("firecracker-binary", "", "path to the firecracker binary")
+		outFile           = flag.String("out", "container.img", "Path to store the image")
+		kernel            = flag.String("kernel", "", "Path to the linux kernel image")
+		firecrackerBinary = flag.String("firecracker-binary", "", "Path to the firecracker binary")
 	)
 
 	flag.Parse()
@@ -52,7 +52,7 @@ func main() {
 		log.Fatal("a container is required")
 	}
 
-	if *linuxKernel == "" {
+	if *kernel == "" {
 		log.Fatalf("a linux kernel is required")
 	}
 
@@ -114,7 +114,7 @@ func main() {
 		log.Fatalf("failed to resize the image %s: %s\n", *outFile, err)
 	}
 
-	bootVM(ctx, *outFile, *linuxKernel, *firecrackerBinary)
+	bootVM(ctx, *outFile, *kernel, *firecrackerBinary)
 }
 
 func extract(ctx context.Context, client *containerd.Client, image containerd.Image, mntDir string) error {
@@ -240,7 +240,7 @@ func writeToFile(filepath string, content string) error {
 	return nil
 }
 
-func bootVM(ctx context.Context, rawImage, linuxKernel, firecrackerBinary string) {
+func bootVM(ctx context.Context, rawImage, kernel, firecrackerBinary string) {
 	vmmCtx, vmmCancel := context.WithCancel(ctx)
 	defer vmmCancel()
 
@@ -254,7 +254,7 @@ func bootVM(ctx context.Context, rawImage, linuxKernel, firecrackerBinary string
 	fcCfg := firecracker.Config{
 		LogLevel:        "debug",
 		SocketPath:      firecrackerSock,
-		KernelImagePath: linuxKernel,
+		KernelImagePath: kernel,
 		KernelArgs:      "console=ttyS0 reboot=k panic=1 acpi=off pci=off i8042.noaux i8042.nomux i8042.nopnp i8042.dumbkbd init=/init.sh random.trust_cpu=on",
 		Drives:          devices,
 		MachineCfg: models.MachineConfiguration{