Print this page
re #12264 cr3916 Need to apply patch ncp3-gate/patches/fs-local-zfs-boot-nexenta to 4.0

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/svc/milestone/fs-local
          +++ new/usr/src/cmd/svc/milestone/fs-local
↓ open down ↓ 85 lines elided ↑ open up ↑
  86   86  
  87   87  # Mount all ZFS filesystems.
  88   88  
  89   89  if [ -x /usr/sbin/zfs ]; then
  90   90          /usr/sbin/zfs mount -va >/dev/msglog 2>&1
  91   91          rc=$?
  92   92          if [ $rc -ne 0 ]; then
  93   93                  msg="WARNING: /usr/sbin/zfs mount -a failed: exit status $rc"
  94   94                  echo $msg
  95   95                  echo "$SMF_FMRI:" $msg >/dev/msglog
  96      -                result=$SMF_EXIT_ERR_FATAL
       96 +                # we do not fail fs-local in nexenta due to simplified
       97 +                # rootfs architecture...
  97   98          fi
  98   99  fi
  99  100  
 100  101  if [ $result = $SMF_EXIT_OK -a $mntretry -eq 1 ]
 101  102  then
 102  103          cd /; /sbin/mountall -l >/dev/msglog
 103  104          rc=$?
 104  105          if [ $rc -ne 0 ]; then
 105  106                  msg="WARNING: /sbin/mountall -l failed: exit status $rc"
 106  107                  echo $msg
 107  108                  echo "$SMF_FMRI:" $msg >/dev/msglog
 108  109                  result=$SMF_EXIT_ERR_FATAL
 109  110          fi
 110  111  fi
 111  112  
 112  113  # Add swap filesystems
 113  114  /sbin/swapadd >/dev/null 2>&1
 114  115  
 115  116  exit $result
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX