Skip to content

Commit

Permalink
2554 ipadm needs IPMP configuration support
Browse files Browse the repository at this point in the history
Contributed by: Ivan Krivonos <ivan.krivonos@nexenta.com>
Contributed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Yuri Pankov <ypankov@tintri.com>
Reviewed by: Andy Fiddaman <andyf@omnios.com>
Reviewed by: Ryan Goodfellow <ryan.goodfellow@oxide.computer>
Approved by: Richard Lowe <richlowe@richlowe.net>
  • Loading branch information
hrosenfeld committed Nov 22, 2021
1 parent f81209f commit a73be61
Show file tree
Hide file tree
Showing 27 changed files with 2,413 additions and 719 deletions.
3 changes: 2 additions & 1 deletion usr/src/cmd/Makefile.check
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2014 Garrett D'Amore <garrett@damore.org>
# Copyright 2017 Nexenta Systems, Inc.
# Copyright 2019 Peter Tribble
# Copyright 2021 Tintri by DDN, Inc. All rights reserved.
#

include ../Makefile.master
Expand Down Expand Up @@ -86,6 +86,7 @@ MANIFEST_SUBDIRS= \
cmd-inet/usr.lib/in.daytimed \
cmd-inet/usr.lib/in.discardd \
cmd-inet/usr.lib/in.echod \
cmd-inet/usr.lib/in.mpathd \
cmd-inet/usr.lib/in.ndpd \
cmd-inet/usr.lib/in.ripngd \
cmd-inet/usr.lib/in.timed \
Expand Down
8 changes: 4 additions & 4 deletions usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#

#
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2021 Tintri by DDN, Inc. All rights reserved.
#

# Needed for ROOTFS_LIBDIR definition
Expand All @@ -38,9 +41,6 @@ ROOTCFGDIR= $(ROOTETC)/ipadm
ROOTCFGFILES= $(CFGFILES:%=$(ROOTCFGDIR)/%)
ROOTMANIFESTDIR= $(ROOTSVCNETWORK)

CERRWARN += -_gcc=-Wno-switch
CERRWARN += $(CNOWARN_UNINIT)

$(ROOTCFGFILES) := OWNER= ipadm
$(ROOTCFGFILES) := GROUP= sys
$(ROOTCFGFILES) := FILEMODE= 644
Expand Down Expand Up @@ -85,4 +85,4 @@ $(ROOTCFGDIR):
$(ROOTCFGDIR)/%: $(ROOTCFGDIR) %
$(INS.file)

include ../../../Makefile.targ
include ../../../Makefile.targ
Loading

0 comments on commit a73be61

Please sign in to comment.