From 247de55b7ea6f9f235a407518b10c1496c8b25b3 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 25 Nov 2022 14:02:57 +0100 Subject: tools/syz-imagegen: support multiple filesystems in -fs flag --- tools/syz-imagegen/imagegen.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/syz-imagegen/imagegen.go b/tools/syz-imagegen/imagegen.go index f0b0fe53b..9b5810dbf 100644 --- a/tools/syz-imagegen/imagegen.go +++ b/tools/syz-imagegen/imagegen.go @@ -573,7 +573,7 @@ func main() { flagDebug = flag.Bool("debug", false, "print lots of debugging output") flagPopulate = flag.String("populate", "", "populate the specified image with files (for internal use)") flagKeepImage = flag.Bool("keep", false, "save disk images as .img files") - flagFS = flag.String("fs", "", "generate images only for this single filesystem") + flagFS = flag.String("fs", "", "comma-separated list of filesystems to generate, all if empty") ) flag.Parse() if *flagDebug { @@ -707,7 +707,7 @@ func printResults(images []*Image, shutdown chan struct{}, keepImage, verbose bo func generateImages(target *prog.Target, flagFS string, list bool) ([]*Image, error) { var images []*Image for _, fs := range fileSystems { - if flagFS != "" && flagFS != fs.Name { + if flagFS != "" && !strings.Contains(","+flagFS+",", ","+fs.Name+",") { continue } index := 0 -- cgit mrf-deployment