[PATCH openbmc 21/32] init: Suppress fsck command not present error by file system type

OpenBMC Patches openbmc-patches at stwcx.xyz
Sat Mar 5 23:30:12 AEDT 2016


From: "Milton D. Miller II" <miltonm at us.ibm.com>

Decide lack of fsck is not a problem by the type of the rwfs image
instead of the full name of the fsck command.  This eliminates
duplicates knowledge of how the fsck path is formed.

Suggested-by: Andrew Jeffery <andrew at aj.id.au>
Signed-off-by: Milton Miller <miltonm at us.ibm.com>
---
 .../common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh
index 538299e..d4d2cc1 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh
@@ -183,7 +183,7 @@ then
 	then
 		debug_takeover "fsck of read-write fs on $rwdev failed (rc=$rc)"
 	fi
-elif test $fsck != /sbin/fsck.jffs2
+elif test "$rwfst" != jffs2
 then
 	echo "No '$fsck' in read only fs, skipping fsck."
 fi
-- 
2.7.1




More information about the openbmc mailing list