Print this page
6197 get rid of unused checks in fs-root and fs-usr boot scripts
@@ -22,12 +22,12 @@
#
# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T.
# All rights reserved.
+# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
#
-#
. /lib/svc/share/smf_include.sh
. /lib/svc/share/fs_include.sh
UPDATEFILE=/etc/svc/volatile/boot_archive_needs_update
@@ -110,14 +110,10 @@
# Unless root is zfs, in which case we've already mounted /usr read-write
#
if [ "$rootiszfs" = 0 ] ; then
readvfstab /usr < $vfstab
if [ "$mountp" ]; then
- if [ "$fstype" = cachefs ]; then
- mountfs -O $mountp cachefs $mntopts $special ||
- exit $SMF_EXIT_ERR_FATAL
- else
checkopt ro $mntopts
if [ "x$option" != xro ]; then
checkfs $fsckdev $fstype $mountp ||
exit $SMF_EXIT_ERR_FATAL
if [ "x$mntopts" != x- ]; then
@@ -136,11 +132,10 @@
mountfs - /usr $fstype $mntopts - ||
exit $SMF_EXIT_ERR_FATAL
fi
fi
- fi
fi
#
# Check and mount the /usr/platform file system. This should only be
# present when a SunOS 5.5 (Solaris 2.5) or greater client is being