From 4ae678d8cee43f0b1af330d349e760f0a5c501a8 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Mon, 20 Feb 2023 17:19:13 -0800 Subject: [PATCH] cmd/mkinitfs: add -no-bootdeploy option to disable boot-deploy --- cmd/mkinitfs/main.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/cmd/mkinitfs/main.go b/cmd/mkinitfs/main.go index ed270df..62b4a69 100644 --- a/cmd/mkinitfs/main.go +++ b/cmd/mkinitfs/main.go @@ -33,8 +33,12 @@ func main() { defer func() { os.Exit(retCode) }() outDir := flag.String("d", "/boot", "Directory to output initfs(-extra) and other boot files") + var showVersion bool flag.BoolVar(&showVersion, "version", false, "Print version and quit.") + + var disableBootDeploy bool + flag.BoolVar(&disableBootDeploy, "no-bootdeploy", false, "Disable running 'boot-deploy' after generating archives.") flag.Parse() if showVersion { @@ -114,13 +118,14 @@ func main() { } // Final processing of initramfs / kernel is done by boot-deploy - if err := bootDeploy(workDir, *outDir, devinfo.UbootBoardname); err != nil { - log.Println(err) - log.Println("bootDeploy failed") - retCode = 1 - return + if !disableBootDeploy { + if err := bootDeploy(workDir, *outDir, devinfo.UbootBoardname); err != nil { + log.Println(err) + log.Println("bootDeploy failed") + retCode = 1 + return + } } - } func bootDeploy(workDir, outDir, ubootBoardname string) error {