Print this page
6198 Let's EOL cachefs
*** 19,28 ****
--- 19,29 ----
#
# CDDL HEADER END
#
#
# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2015 Nexenta Systems, Inc. All rights reserved.
#
. /lib/svc/share/fs_include.sh
. /lib/svc/share/net_include.sh
*** 171,199 ****
*)
new_special=`$STMSBOOTUTIL -m $special`
;;
esac
- if [ "$fstype" = "cachefs" ]; then
- # Mount read-only without the cache.
- case "$mntopts" in
- *backfstype=nfs*)
- cfsbacktype=nfs
- ;;
- *backfstype=hsfs*)
- cfsbacktype=hsfs
- ;;
- *)
- cecho 'stmsboot: invalid vfstab entry for /usr'
- cfsbacktype=nfs
- ;;
- esac
- # see the comment below for /dev/null
- $MOUNT -m -F $cfsbacktype -o ro $new_special $mountp \
- >/dev/null 2>&1
- ret_val=$?
- else
#
# Must use -o largefiles here to ensure the read-only
# mount does not fail as a result of having a large
# file present on /usr.
#
--- 172,181 ----
*** 223,233 ****
# will emit messages if /usr is already mounted.
# So redirect the output to /dev/null.
$MOUNT -m -F $fstype -o $mntopts $new_special /usr \
>/dev/null 2>&1
ret_val=$?
- fi
if [ $ret_val -eq 0 ]; then
usrmounted=1
fi
fi
--- 205,214 ----