Print this page
    
NEX-7823 ipmgmtd can't properly remove interface from the old ipadm.conf format
Reviewed by: Dan Fields <dan.fields@nexenta.com>
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
    
      
        | Split | 
	Close | 
      
      | Expand all | 
      | Collapse all | 
    
    
          --- old/usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile
          +++ new/usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile
   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
  
    | 
      ↓ open down ↓ | 
    10 lines elided | 
    
      ↑ open up ↑ | 
  
  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 +
       22 +#
  21   23  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       24 +# Copyright 2016 Nexenta Systems, Inc.
  22   25  #
  23   26  
  24   27  # Needed for ROOTFS_LIBDIR definition
  25   28  include         ../../../../lib/Makefile.lib
  26   29  
  27   30  PROG=           ipmgmtd
  28   31  OBJS=           ipmgmt_main.o ipmgmt_door.o ipmgmt_persist.o ipmgmt_util.o
  29   32  SRCS=           $(OBJS:.o=.c)
  30   33  SVCMETHOD=      net-ipmgmt
  31   34  MANIFEST=       network-ipmgmt.xml
  32   35  CFGFILES=       ipadm.conf
  33   36  
  34   37  # Needed for ROOTETC definition
  35   38  include         ../../../Makefile.cmd
  36   39  
  37   40  ROOTCFGDIR=             $(ROOTETC)/ipadm
  38   41  ROOTCFGFILES=           $(CFGFILES:%=$(ROOTCFGDIR)/%)
  39   42  ROOTMANIFESTDIR=        $(ROOTSVCNETWORK)
  40   43  
  41      -CERRWARN += -_gcc=-Wno-switch
  42      -CERRWARN += -_gcc=-Wno-uninitialized
  43      -
  44   44  $(ROOTCFGFILES) := OWNER= ipadm
  45   45  $(ROOTCFGFILES) := GROUP= sys
  46   46  $(ROOTCFGFILES) := FILEMODE= 644
  47   47  
  48   48  ROOTCMDDIR=     $(ROOTFS_LIBDIR)/inet
  49   49  
  50   50  LDLIBS += -lipadm -lnvpair -lsecdb -lnsl -lumem -lscf
  51   51  
  52   52  #
  53   53  # Instrument ipmgmtd with CTF data to ease debugging.
  54   54  #
  55   55  CTFCONVERT_HOOK = && $(CTFCONVERT_O)
  56   56  CTFMERGE_HOOK = && $(CTFMERGE) -L VERSION -o $@ $(OBJS)
  57   57  $(OBJS) := CFLAGS += $(CTF_FLAGS)
  58   58  
  59   59  .KEEP_STATE:
  60   60  
  61   61  .PARALLEL:
  62   62  
  63   63  all: $(PROG)
  64   64  
  65   65  $(PROG): $(OBJS)
  66   66          $(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(CTFMERGE_HOOK)
  67   67          $(POST_PROCESS)
  68   68  
  69   69  install: $(ROOTCMD) $(ROOTMANIFEST) $(ROOTSVCMETHOD) $(ROOTCFGDIR) \
  70   70          $(ROOTCFGFILES)
  71   71  
  72   72  check:  $(SRCS) $(HEADERS) $(CHKMANIFEST)
  73   73          $(CSTYLE) -cpP $(SRCS) $(HEADERS)
  74   74  
  75   75  $(ROOTCMD): $(PROG)
  76   76  
  77   77  clean:
  78   78          $(RM) $(OBJS)
  79   79  
  80   80  lint:   lint_SRCS
  81   81  
  82   82  $(ROOTCFGDIR):
  83   83          $(INS.dir)
  84   84  
  85   85  $(ROOTCFGDIR)/%: $(ROOTCFGDIR) %
  86   86          $(INS.file)
  87   87  
  88   88  include         ../../../Makefile.targ
  
    | 
      ↓ open down ↓ | 
    35 lines elided | 
    
      ↑ open up ↑ | 
  
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX