Print this page
6198 Let's EOL cachefs

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/svc/shell/smf_include.sh
          +++ new/usr/src/cmd/svc/shell/smf_include.sh
↓ open down ↓ 14 lines elided ↑ open up ↑
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the
  17   17  # fields enclosed by brackets "[]" replaced with your own identifying
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]
  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  #
  23   23  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
       25 +# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
  25   26  #
  26   27  
  27   28  smf_present () {
  28   29          [ -r /etc/svc/volatile/repository_door ] && \
  29   30              [ ! -f /etc/svc/volatile/repository_door ]
  30   31  }
  31   32  
  32   33  smf_clear_env () {
  33   34          unset \
  34   35                  SMF_FMRI \
↓ open down ↓ 92 lines elided ↑ open up ↑
 127  128  #   The network boot strategy for a zone is always "none".
 128  129  #
 129  130  smf_netstrategy () {
 130  131          if smf_is_nonglobalzone; then
 131  132                  _INIT_NET_STRATEGY="none" export _INIT_NET_STRATEGY
 132  133                  return 0
 133  134          fi
 134  135  
 135  136          set -- `/sbin/netstrategy`
 136  137          if [ $? -eq 0 ]; then
 137      -                [ "$1" = "nfs" -o "$1" = "cachefs" ] && \
      138 +                [ "$1" = "nfs" ] && \
 138  139                          _INIT_NET_IF="$2" export _INIT_NET_IF
 139  140                  _INIT_NET_STRATEGY="$3" export _INIT_NET_STRATEGY
 140  141          else
 141  142                  return 1
 142  143          fi
 143  144  }
 144  145  
 145  146  #
 146  147  # smf_kill_contract CONTRACT SIGNAL WAIT TIMEOUT
 147  148  #
↓ open down ↓ 96 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX