initrd.scripts: fs_type_in_use() simplification

Karlson2k · Karlson2k · commit 17d6cc4e23da · 2020-09-02T15:49:40.000+03:00
Signed-off-by: Karlson2k (Evgeny Grin) &lt;k2k@narod.ru&gt;
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
@@ -1059,8 +1059,7 @@ run_shell() {
 }
 
 fs_type_in_use() {
-	fs_type=$1
-	cut -d ' ' -f 3 < /proc/mounts | grep -Fq "${fs_type}"
+	grep -Eqse '^[^ ]+ [^ ]+ ${1} ' /proc/mounts
 }
 
 mount_devfs() {

Original file line number	Diff line number	Diff line change
`@@ -1059,8 +1059,7 @@ run_shell() {`
`1059`	`1059`	`}`
`1060`	`1060`
`1061`	`1061`	`fs_type_in_use() {`
`1062`		`- fs_type=$1`
`1063`		`- cut -d ' ' -f 3 < /proc/mounts \| grep -Fq "${fs_type}"`
	`1062`	`+ grep -Eqse '^[^ ]+ [^ ]+ ${1} ' /proc/mounts`
`1064`	`1063`	`}`
`1065`	`1064`
`1066`	`1065`	`mount_devfs() {`