Print this page
6198 Let's EOL cachefs

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/stmsboot/stmsboot.sh
          +++ new/usr/src/cmd/stmsboot/stmsboot.sh
↓ open down ↓ 13 lines elided ↑ open up ↑
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  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 (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
       24 +# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
  24   25  #
  25   26  #
  26   27  PATH=/usr/bin:/usr/sbin:$PATH; export PATH
  27   28  STMSBOOTUTIL=/lib/mpxio/stmsboot_util
  28   29  STMSMETHODSCRIPT=/lib/svc/method/mpxio-upgrade
  29   30  KDRVCONF=
  30   31  DRVCONF=
  31   32  TMPDRVCONF=
  32   33  TMPDRVCONF_MPXIO_ENTRY=
  33   34  TMPDRVCONF_SATA_ENTRY=
↓ open down ↓ 508 lines elided ↑ open up ↑
 542  543  
 543  544  # make sure we can stash our data somewhere private
 544  545  if [ ! -d $SAVEDIR ]; then
 545  546          $MKDIR -p $SAVEDIR
 546  547  fi
 547  548  # prime the cache
 548  549  $STMSBOOTUTIL -i
 549  550  
 550  551  
 551  552  if [ "$cmd" = "enable" -o "$cmd" = "disable" -o "$cmd" = "update" ]; then
 552      -        #
 553      -        # The bootup script doesn't work on cache-only-clients as the script
 554      -        # is executed before the plumbing for cachefs mounting of root is done.
 555      -        #
 556      -        if $MOUNT -v | $EGREP -s " on / type (nfs|cachefs) "; then
 557      -                gettext "This command option is not supported on systems with an nfs or cachefs mounted root filesystem.\n" 1>&2
      553 +        if $MOUNT -v | $EGREP -s " on / type nfs "; then
      554 +                gettext "This command option is not supported on systems with an nfs mounted root filesystem.\n" 1>&2
 558  555                  exit 1
 559  556          fi
 560  557  
 561  558          # if the user has left the system with the mpxio-upgrade service
 562  559          # in a temporarily disabled state (ie, service is armed for the next
 563  560          # reboot), then let them know. We need to ensure that the system is
 564  561          # is in a sane state before allowing any further invocations, so 
 565  562          # try to get the system admin to do so
 566  563  
 567  564          ISARMED=`$SVCS -l $STMSINSTANCE|$GREP "enabled.*false.*temporary"`
↓ open down ↓ 102 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX