tools/bootconfig: fix single & used for logical condition

aafeijoo-suse · mhiramat · commit cf8c59a3756b · 2023-02-22T08:27:35.000+09:00
A single & will create a background process and return true, so the grep command will run even if the file checked in the first condition does not exist. Link: https://lore.kernel.org/all/20230112114215.17103-1-antonio.feijoo@suse.com/ Fixes: 1eaad3a ("tools/bootconfig: Use per-group/all enable option in ftrace2bconf script") Signed-off-by: Antonio Alvarez Feijoo <antonio.feijoo@suse.com> Cc: stable@vger.kernel.org Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
diff --git a/tools/bootconfig/scripts/ftrace2bconf.sh b/tools/bootconfig/scripts/ftrace2bconf.sh
@@ -93,7 +93,7 @@ referred_vars() {
 }
 
 event_is_enabled() { # enable-file
-	test -f $1 & grep -q "1" $1
+	test -f $1 && grep -q "1" $1
 }
 
 per_event_options() { # event-dir

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ referred_vars() {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`event_is_enabled() { # enable-file`
`96`		`- test -f $1 & grep -q "1" $1`
	`96`	`+ test -f $1 && grep -q "1" $1`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`per_event_options() { # event-dir`