u-root: default to building with gobusybox if GO111MODULE!="off"

The build process now defaults to the new gobusybox UNLESS GO111MODULE is set to off. Signed-off-by: Ronald G. Minnich <[email protected]>
Raysmond · Dec 8, 2021 · f0724a5 · f0724a5
1 parent ebce0b0
commit f0724a5
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/u-root.go b/u-root.go
@@ -93,7 +93,7 @@ func init() {
 	tags = flag.String("tags", "", "Comma separated list of build tags")
 
 	// Flags for the gobusybox, which we hope to move to, since it works with modules.
-	usegobusybox = flag.Bool("gobusybox", false, "Use the new gobusybox package to build u-root")
+	usegobusybox = flag.Bool("gobusybox", os.Getenv("GO111MODULE") != "off", "Use the new gobusybox package to build u-root")
 	genDir = flag.String("gen-dir", "", "Directory to generate source in")
 
 }
@@ -169,12 +169,15 @@ func gobusyboxMain() error {
 	if tmpDir == "" {
 		tdir, err := ioutil.TempDir("", "bb-")
 		if err != nil {
-			log.Fatalf("Could not create busybox source directory: %v", err)
+			return fmt.Errorf("Could not create busybox source directory: %v", err)
 		}
 		tmpDir = tdir
 		remove = true
 	}
 
+	if len(flag.Args()) == 0 {
+		return fmt.Errorf("commands must be provided, as a path or glob, e.g., u-root cmds/core/* cmds/exp/rush")
+	}
 	opts := &gbb.Opts{
 		Env:          env,
 		GenSrcDir:    tmpDir,