changeset 974:19b5ecbe56ef

6354381 checkfs() fails irritably for fsck-free filesystems
author sch
date Tue, 22 Nov 2005 16:59:17 -0800
parents d16e094eee6e
children f1c1d0819d85
files usr/src/cmd/svc/shell/fs_include.sh
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/svc/shell/fs_include.sh	Tue Nov 22 16:18:57 2005 -0800
+++ b/usr/src/cmd/svc/shell/fs_include.sh	Tue Nov 22 16:59:17 2005 -0800
@@ -124,7 +124,6 @@
 	# /usr failed or the /usr filesystem is badly damanged.  In either
 	# case, there is not much to be done automatically.  Fail with
 	# a message to the user.
-
 	if [ ! -x /usr/sbin/fsck ]; then
 		cecho ""
 		cecho "WARNING - /usr/sbin/fsck not found.  Most likely the"
@@ -134,6 +133,10 @@
 		return 1
 	fi
 
+	# If a filesystem-specific fsck binary is unavailable, then no
+	# fsck pass is required.
+	[ ! -x /usr/lib/fs/$2/fsck ] && [ ! -x /etc/fs/$2/fsck ] && return
+
 	/usr/sbin/fsck -F $2 -m $1 >/dev/null 2>&1
 
 	if [ $? -ne 0 ]; then