Print this page
Clean up merge problems with illumos#11083 (nfs-zone)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/fs.d/nfs/svc/nfs-server
          +++ new/usr/src/cmd/fs.d/nfs/svc/nfs-server
↓ open down ↓ 45 lines elided ↑ open up ↑
  46   46  # when the file is missing.
  47   47  #
  48   48  configure_ipfilter()
  49   49  {
  50   50          ipfile=`fmri_to_file $SMF_FMRI $IPF_SUFFIX`
  51   51          ip6file=`fmri_to_file $SMF_FMRI $IPF6_SUFFIX`
  52   52          [ -f "$ipfile" -a -f "$ip6file" ] && return 0
  53   53  
  54   54          #
  55   55          # Nothing to do if:
       56 +        # - service's policy is 'use_global'
  56   57          # - ipfilter isn't online
  57   58          # - global policy is 'custom'
  58   59          #
  59   60          [ "`get_policy $SMF_FMRI`" = "use_global" ] && return 0
  60   61          service_check_state $IPF_FMRI $SMF_ONLINE || return 0
  61   62          [ "`get_global_def_policy`" = "custom" ] && return 0
  62   63  
  63   64          svcadm restart $IPF_FMRI
  64   65  }
  65   66  
↓ open down ↓ 248 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX