re #12736 rb4102 apropos returns duplicate lines in some cases
re #12661 rb4067 Need ipadm(1M) man page (fix packaging)

          --- old/usr/src/pkg/manifests/system-network.mf
          +++ new/usr/src/pkg/manifests/system-network.mf

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each

  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       24 +# Copyright 2013 Nexenta Systems, Inc. All rights reserved.
  24   25  #
  25   26  
  26   27  set name=pkg.fmri value=pkg:/system/network@$(PKGVERS)
  27   28  set name=pkg.description \
  28   29      value="core software for network infrastructure configuration"
  29   30  set name=pkg.summary value="Core Solaris Network Infrastructure"
  30   31  set name=info.classification value=org.opensolaris.category.2008:System/Core
  31   32  set name=variant.arch value=$(ARCH)
  32   33  dir path=etc group=sys
  33   34  dir path=etc/default group=sys

  34   35  dir path=etc/dladm group=netadm owner=dladm
  35   36  dir path=etc/inet group=sys
  36   37  dir path=etc/inet/ike group=sys
  37   38  dir path=etc/inet/ike/crls group=sys
  38   39  dir path=etc/inet/ike/publickeys group=sys
  39   40  dir path=etc/inet/secret group=sys mode=0700
  40   41  dir path=etc/inet/secret/ike.privatekeys group=sys mode=0700
  41   42  dir path=etc/ipadm group=netadm owner=netadm
  42   43  dir path=etc/nwam group=netadm owner=netadm
  43   44  dir path=etc/nwam/loc group=netadm owner=netadm
  44   45  dir path=etc/nwam/loc/NoNet group=netadm owner=netadm
  45   46  dir path=sbin group=sys
  46   47  dir path=usr/lib/dl
  47   48  dir path=usr/share/man
  48   49  dir path=usr/share/man/man1m
  49   50  file path=etc/default/dhcpagent group=sys \
  50   51      original_name=SUNWcnetr:etc/default/dhcpagent preserve=true
  51   52  file path=etc/default/inetinit group=sys \
  52   53      original_name=SUNWcnetr:etc/default/inetinit preserve=true
  53   54  file path=etc/default/ipsec group=sys \
  54   55      original_name=SUNWcnetr:etc/default/ipsec preserve=true
  55   56  file path=etc/default/mpathd group=sys \
  56   57      original_name=SUNWcnetr:etc/default/mpathd preserve=true
  57   58  file path=etc/dladm/datalink.conf group=netadm \
  58   59      original_name=SUNWcnetr:etc/dladm/datalink.conf owner=dladm preserve=true
  59   60  file path=etc/dladm/flowadm.conf group=netadm \
  60   61      original_name=SUNWcnetr:etc/dladm/flowadm.conf owner=dladm preserve=true
  61   62  file path=etc/dladm/flowprop.conf group=netadm \
  62   63      original_name=SUNWcnetr:etc/dladm/flowprop.conf owner=dladm preserve=true
  63   64  file path=etc/dladm/secobj.conf group=netadm mode=0660 \
  64   65      original_name=SUNWcnetr:etc/dladm/secobj.conf owner=dladm preserve=true
  65   66  file path=etc/inet/datemsk.ndpd group=sys mode=0444
  66   67  file path=etc/inet/ike/config.sample group=sys mode=0444
  67   68  file path=etc/inet/ipsecalgs group=sys \
  68   69      original_name=SUNWcnetr:etc/inet/ipsecalgs preserve=true
  69   70  file path=etc/inet/ipsecinit.sample group=sys mode=0444
  70   71  file path=etc/inet/secret/ike.preshared group=sys mode=0600 \
  71   72      original_name=SUNWcnetr:etc/inet/secret/ike.preshared preserve=true
  72   73  file path=etc/inet/secret/ipseckeys.sample group=sys mode=0600
  73   74  file path=etc/ipadm/ipadm.conf group=netadm owner=netadm preserve=true
  74   75  file path=etc/nwam/loc/NoNet/ipf.conf.dfl group=netadm owner=netadm \
  75   76      preserve=true
  76   77  file path=etc/nwam/loc/NoNet/ipf6.conf.dfl group=netadm owner=netadm \
  77   78      preserve=true
  78   79  file path=etc/nwam/loc/create_loc_auto group=netadm owner=netadm preserve=true
  79   80  file path=etc/nwam/loc/create_loc_nonet group=netadm owner=netadm \
  80   81      preserve=true
  81   82  file path=sbin/dladm mode=0555
  82   83  file path=sbin/dlstat mode=0555
  83   84  file path=sbin/flowadm mode=0555
  84   85  file path=sbin/flowstat mode=0555
  85   86  file path=sbin/ipadm mode=0555
  86   87  file path=usr/lib/dl/dlled mode=0555
  87   88  file path=usr/lib/dl/dltraninfo mode=0555
  88   89  file path=usr/share/man/man1m/dladm.1m
  89   90  file path=usr/share/man/man1m/flowadm.1m
  90   91  file path=usr/share/man/man1m/ipadm.1m
  91   92  group groupname=netadm gid=65
  92   93  legacy pkg=SUNWcnetr \
  93   94      desc="core software for network infrastructure configuration" \
  94   95      name="Core Solaris Network Infrastructure (Root)"
  95   96  license cr_Sun license=cr_Sun
  96   97  license lic_CDDL license=lic_CDDL
  97   98  user username=dladm ftpuser=false gcos-field="Datalink Admin" group=netadm \
  98   99      uid=15
  99  100  user username=netadm ftpuser=false gcos-field="Network Admin" group=netadm \
 100  101      uid=16
 101  102  user username=netcfg ftpuser=false gcos-field="Network Configuration Admin" \
 102  103      group=netadm uid=17

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX