diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/svc/svccfg/Makefile | 10 | ||||
| -rw-r--r-- | usr/src/man/man8/ipadm.8 | 14 |
2 files changed, 14 insertions, 10 deletions
diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile index e6226ab19e..fb277942b9 100644 --- a/usr/src/cmd/svc/svccfg/Makefile +++ b/usr/src/cmd/svc/svccfg/Makefile @@ -67,7 +67,8 @@ $(NATIVE_BUILD)OBJS = $(MYOBJS:%.o=%-native.o) MAPFILES += $(MAPFILE.LEX) $(MAPFILE.NGB) MAPOPTS = $(MAPFILES:%=-Wl,-M%) -MYCPPFLAGS = -I ../common -I$(ADJUNCT_PROTO)/usr/include/libxml2 +$(NOT_NATIVE)MYCPPFLAGS = -I ../common -I$(ADJUNCT_PROTO)/usr/include/libxml2 +$(NATIVE_BUILD)MYCPPFLAGS = -I ../common -I$(NATIVE_ADJUNCT)/include/libxml2 CPPFLAGS += $(MYCPPFLAGS) LDFLAGS += $(MAPOPTS) @@ -87,13 +88,12 @@ YFLAGS = -d CLOBBERFILES += svccfg_lex.c svccfg_grammar.c svccfg_grammar.h \ $(MYPROG:%=%-native) -SVCCFG_EXTRA_LIBS = -lxml2 -lscf -ll -luutil -lumem -lmd5 -lnvpair +SVCCFG_EXTRA_LIBS = -lxml2 -lscf -ll -luutil -lumem -lmd -lnvpair $(NOT_NATIVE)SVCCFG_EXTRA_LIBS += -ltecla # # If no adjunct, then we'll already find /usr/lib via LDLIBS below. # -$(NO_ADJUNCT_PROTO)NATIVE_LIBS += libxml2.so libl.so libumem.so \ - libmd5.so libnvpair.so libc.so +NATIVE_LIBS += libxml2.so libl.so libumem.so libmd.so libnvpair.so libc.so LIBSCF = $(SRC)/lib/libscf LIBTECLA = $(SRC)/lib/libtecla # just for the header @@ -115,7 +115,7 @@ $(NATIVE_BUILD)LDFLAGS = $(BDIRECT) $(NATIVE_BUILD)LDLIBS = \ -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native \ -L$(LIBSCF)/native -R $(LIBSCF)/native \ - -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \ + -L$(NATIVE_ADJUNCT)/lib -R$(NATIVE_ADJUNCT)/lib \ $(SVCCFG_EXTRA_LIBS) svccfg_lex.o svccfg_grammar.o := CCVERBOSE = diff --git a/usr/src/man/man8/ipadm.8 b/usr/src/man/man8/ipadm.8 index a308a240a8..770ce52762 100644 --- a/usr/src/man/man8/ipadm.8 +++ b/usr/src/man/man8/ipadm.8 @@ -15,7 +15,7 @@ .\" Copyright 2021 OmniOS Community Edition (OmniOSce) Association. .\" Copyright 2021 Tintri by DDN, Inc. All rights reserved. .\" -.Dd November 15, 2021 +.Dd August 20, 2022 .Dt IPADM 8 .Os .Sh NAME @@ -192,16 +192,20 @@ For subcommands that take an .Em addrobj , the .Em addrobj -specifies a unique address on the system. +specifies a unique address on the system, and must be unique itself. It is made up of two parts, delimited by a .Sq / . -The first part is the name of the interface and the second part is a string up -to 32 characters long. +The first part is the name of the interface and the second part is an arbitrary +string up to 32 alphanumeric characters long, where the first character must be +alphabetic +.Pq e.g. a-z,A-Z . For example, .Qq lo0/v4 is a loopback interface .Em addrobj -name. +name, which could also be called +.Qq lo0/ipv4loopback . +Consumers should note that this length limit may be lifted in the future. .Pp For subcommands that take a .Em protocol , |