6 files changed, 12 insertions, 8 deletions
diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf
index af8d0d9d59..5ccb4a0b87 100644
--- a/usr/src/pkg/manifests/SUNWcs.mf
+++ b/usr/src/pkg/manifests/SUNWcs.mf
@@ -486,6 +486,7 @@ file path=etc/user_attr.d/SUNWcs group=sys
 file path=etc/vfstab group=sys preserve=true
 file path=lib/crypto/kcfd mode=0555
 file path=lib/inet/in.mpathd mode=0555
+file path=lib/inet/ipmgmtd mode=0555
 file path=lib/inet/netcfgd mode=0555
 file path=lib/inet/nwamd mode=0555
 file path=lib/svc/bin/lsvcrun group=sys mode=0555
@@ -512,6 +513,7 @@ file path=lib/svc/method/ldap-client mode=0555
 file path=lib/svc/method/manifest-import mode=0555
 file path=lib/svc/method/mpxio-upgrade mode=0555
 file path=lib/svc/method/net-init mode=0555
+file path=lib/svc/method/net-ipmgmt mode=0555
 file path=lib/svc/method/net-ipqos mode=0555
 file path=lib/svc/method/net-iptun mode=0555
 file path=lib/svc/method/net-loc mode=0555
@@ -968,6 +970,7 @@ file path=usr/lib/help/auths/locale/C/NetworkAutoconfWrite.html
 file path=usr/lib/help/auths/locale/C/NetworkHeader.html
 file path=usr/lib/help/auths/locale/C/NetworkILBconf.html
 file path=usr/lib/help/auths/locale/C/NetworkILBenable.html
+file path=usr/lib/help/auths/locale/C/NetworkInterfaceConfig.html
 file path=usr/lib/help/auths/locale/C/NetworkVRRP.html
 file path=usr/lib/help/auths/locale/C/PriAdmin.html
 file path=usr/lib/help/auths/locale/C/ProfmgrHeader.html
@@ -1930,6 +1933,7 @@ file path=lib/svc/manifest/network/ipsec/manual-key.xml group=sys mode=0444
 file path=lib/svc/manifest/network/ipsec/policy.xml group=sys mode=0444
 file path=lib/svc/manifest/network/ldap/client.xml group=sys mode=0444
 file path=lib/svc/manifest/network/network-initial.xml group=sys mode=0444
+file path=lib/svc/manifest/network/network-ipmgmt.xml group=sys mode=0444
 file path=lib/svc/manifest/network/network-ipqos.xml group=sys mode=0444
 file path=lib/svc/manifest/network/network-iptun.xml group=sys mode=0444
 file path=lib/svc/manifest/network/network-location.xml group=sys mode=0444
@@ -2689,6 +2693,7 @@ link path=usr/sbin/ifconfig target=../../sbin/ifconfig
 link path=usr/sbin/inetd target=../lib/inet/inetd
 link path=usr/sbin/init target=../../sbin/init
 $(i386_ONLY)link path=usr/sbin/installgrub target=../../sbin/installgrub
+link path=usr/sbin/ipadm target=../../sbin/ipadm
 link path=usr/sbin/ipmpstat target=../../sbin/ipmpstat
 link path=usr/sbin/labelit target=./clri
 link path=usr/sbin/lockfs target=../lib/fs/ufs/lockfs
diff --git a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf
index fc19087040..de6c33c804 100644
--- a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf
+++ b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf
@@ -137,6 +137,7 @@ file path=usr/lib/help/auths/locale/NetworkAutoconfWrite.html
 file path=usr/lib/help/auths/locale/NetworkHeader.html
 file path=usr/lib/help/auths/locale/NetworkILBconf.html
 file path=usr/lib/help/auths/locale/NetworkILBenable.html
+file path=usr/lib/help/auths/locale/NetworkInterfaceConfig.html
 file path=usr/lib/help/auths/locale/NetworkVRRP.html
 file path=usr/lib/help/auths/locale/PriAdmin.html
 file path=usr/lib/help/auths/locale/PrintAdmin.html
diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf
index b95dd46026..915d16adc2 100644
--- a/usr/src/pkg/manifests/system-header.mf
+++ b/usr/src/pkg/manifests/system-header.mf
@@ -383,6 +383,7 @@ $(i386_ONLY)file path=usr/include/ia32/sys/traptrace.h
 file path=usr/include/iconv.h
 file path=usr/include/idmap.h
 file path=usr/include/ieeefp.h
+file path=usr/include/ifaddrs.h
 file path=usr/include/inet/arp.h
 file path=usr/include/inet/common.h
 file path=usr/include/inet/ip.h
@@ -412,6 +413,7 @@ file path=usr/include/inet/tcp.h
 file path=usr/include/inet/tcp_sack.h
 file path=usr/include/inet/tcp_stack.h
 file path=usr/include/inet/tcp_stats.h
+file path=usr/include/inet/tunables.h
 file path=usr/include/inet/wifi_ioctl.h
 file path=usr/include/inttypes.h
 file path=usr/include/ipmp.h
diff --git a/usr/src/pkg/manifests/system-kernel.mf b/usr/src/pkg/manifests/system-kernel.mf
index a1152c7d29..5d4a719b58 100644
--- a/usr/src/pkg/manifests/system-kernel.mf
+++ b/usr/src/pkg/manifests/system-kernel.mf
@@ -214,8 +214,6 @@ driver name=rts perms="rts 0666 root sys"
 driver name=sad perms="admin 0666 root sys" perms="user 0666 root sys"
 driver name=scsi_vhci class=scsi-self-identifying perms="* 0666 root sys" \
     policy="devctl write_priv_set=sys_devices"
-driver name=sctp perms="* 0666 root sys"
-driver name=sctp6 perms="* 0666 root sys"
 $(sparc_ONLY)driver name=sd perms="* 0640 root sys" \
     alias=ide-cdrom \
     alias=scsiclass,00 \
@@ -365,8 +363,6 @@ file path=kernel/drv/$(ARCH64)/random group=sys
 file path=kernel/drv/$(ARCH64)/rts group=sys
 file path=kernel/drv/$(ARCH64)/sad group=sys
 file path=kernel/drv/$(ARCH64)/scsi_vhci group=sys
-file path=kernel/drv/$(ARCH64)/sctp group=sys
-file path=kernel/drv/$(ARCH64)/sctp6 group=sys
 file path=kernel/drv/$(ARCH64)/sd group=sys
 file path=kernel/drv/$(ARCH64)/sgen group=sys
 file path=kernel/drv/$(ARCH64)/simnet group=sys
@@ -507,10 +503,6 @@ $(i386_ONLY)file path=kernel/drv/scsi_vhci group=sys
 file path=kernel/drv/scsi_vhci.conf group=sys \
     original_name=SUNWckr:kernel/drv/scsi_vhci.conf preserve=true \
     reboot-needed=false
-$(i386_ONLY)file path=kernel/drv/sctp group=sys
-file path=kernel/drv/sctp.conf group=sys reboot-needed=false
-$(i386_ONLY)file path=kernel/drv/sctp6 group=sys
-file path=kernel/drv/sctp6.conf group=sys reboot-needed=false
 $(sparc_ONLY)file path=kernel/drv/sd.conf group=sys \
     original_name=SUNWckr:kernel/drv/sd.conf preserve=true reboot-needed=false
 $(i386_ONLY)file path=kernel/drv/sgen group=sys
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf
index 6823b4149e..4bf5e75395 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.mf
@@ -181,6 +181,7 @@ file path=lib/libgen.so.1
 file path=lib/libinetcfg.so.1
 file path=lib/libinetutil.so.1
 file path=lib/libintl.so.1
+file path=lib/libipadm.so.1
 file path=lib/libipmp.so.1
 file path=lib/libkcfd.so.1
 file path=lib/libkmf.so.1
diff --git a/usr/src/pkg/manifests/system-network.mf b/usr/src/pkg/manifests/system-network.mf
index 14e3840ade..fe17448d86 100644
--- a/usr/src/pkg/manifests/system-network.mf
+++ b/usr/src/pkg/manifests/system-network.mf
@@ -40,6 +40,7 @@ dir path=etc/inet/ike/crls group=sys
 dir path=etc/inet/ike/publickeys group=sys
 dir path=etc/inet/secret group=sys mode=0700
 dir path=etc/inet/secret/ike.privatekeys group=sys mode=0700
+dir path=etc/ipadm group=netadm owner=netadm
 dir path=etc/nwam group=netadm owner=netadm
 dir path=etc/nwam/loc group=netadm owner=netadm
 dir path=etc/nwam/loc/NoNet group=netadm owner=netadm
@@ -70,6 +71,7 @@ file path=etc/inet/secret/ike.preshared group=sys mode=0600 \
 file path=etc/inet/secret/ipseckeys.sample group=sys mode=0600
 file path=etc/inet/sock2path group=sys \
     original_name=SUNWcnetr:etc/inet/sock2path preserve=true
+file path=etc/ipadm/ipadm.conf group=netadm owner=netadm preserve=true
 file path=etc/nwam/loc/NoNet/ipf.conf.dfl group=netadm owner=netadm \
     preserve=true
 file path=etc/nwam/loc/NoNet/ipf6.conf.dfl group=netadm owner=netadm \
@@ -81,6 +83,7 @@ file path=sbin/dlstat mode=0555
 file path=sbin/flowadm mode=0555
 file path=sbin/flowstat mode=0555
 group groupname=netadm gid=65
+file path=sbin/ipadm mode=0555
 legacy pkg=SUNWcnetr arch=$(ARCH) category=system \
     desc="core software for network infrastructure configuration" \
     hotline="Please contact your local service provider" \