diff options
| author | Darren Reed <Darren.Reed@Sun.COM> | 2009-09-30 11:56:44 -0700 |
|---|---|---|
| committer | Darren Reed <Darren.Reed@Sun.COM> | 2009-09-30 11:56:44 -0700 |
| commit | 7b57f05abb8796d3c91c8d4d4c75dcafb5af6b69 (patch) | |
| tree | a77d10015b29b27f562b1a141637f95a8028460d /usr | |
| parent | 3e84473b6e65cbd42bd831e14715b21359e0a687 (diff) | |
| download | illumos-joyent-7b57f05abb8796d3c91c8d4d4c75dcafb5af6b69.tar.gz | |
6886324 (ns = netstack_find_by_zoneid(zoneid)) != NULL panic in ipnet_find_by_zoneid
6886387 SUNWpacketh and SUNWpacketu seem incorrectly packaged
6886759 SUNWpacktu has incorrect package designation
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/pkgdefs/SUNWpacketh/pkginfo.tmpl | 2 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWpacketu/pkginfo.tmpl | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/inet/ipnet/ipnet.c | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/usr/src/pkgdefs/SUNWpacketh/pkginfo.tmpl b/usr/src/pkgdefs/SUNWpacketh/pkginfo.tmpl index e534973117..eb9e592e25 100644 --- a/usr/src/pkgdefs/SUNWpacketh/pkginfo.tmpl +++ b/usr/src/pkgdefs/SUNWpacketh/pkginfo.tmpl @@ -45,7 +45,7 @@ CLASSES="none" BASEDIR=/ SUNW_PKGVERS="1.0" SUNW_PKG_ALLZONES="true" -SUNW_PKG_HOLLOW="true" +SUNW_PKG_HOLLOW="false" SUNW_PKG_THISZONE="false" #VSTOCK="<reserved by Release Engineering for package part #>" #ISTATES="<developer defined>" diff --git a/usr/src/pkgdefs/SUNWpacketu/pkginfo.tmpl b/usr/src/pkgdefs/SUNWpacketu/pkginfo.tmpl index fc016942eb..bf6400be06 100644 --- a/usr/src/pkgdefs/SUNWpacketu/pkginfo.tmpl +++ b/usr/src/pkgdefs/SUNWpacketu/pkginfo.tmpl @@ -34,18 +34,18 @@ ARCH="ISA" VERSION="ONVERS,REV=0.0.0" SUNW_PRODNAME="SunOS" SUNW_PRODVERS="RELEASE/VERSION" -SUNW_PKGTYPE="root" +SUNW_PKGTYPE="usr" MAXINST="1000" CATEGORY="system" DESC="BPF/PF_PACKET kernel packet modules" VENDOR="Sun Microsystems, Inc." HOTLINE="Please contact your local service provider" EMAIL="" -CLASSES="none preserve manifest" +CLASSES="none preserve" BASEDIR=/ SUNW_PKGVERS="1.0" SUNW_PKG_ALLZONES="true" -SUNW_PKG_HOLLOW="false" +SUNW_PKG_HOLLOW="true" SUNW_PKG_THISZONE="false" #VSTOCK="<reserved by Release Engineering for package part #>" #ISTATES="<developer defined>" diff --git a/usr/src/uts/common/inet/ipnet/ipnet.c b/usr/src/uts/common/inet/ipnet/ipnet.c index c5cf382349..781a1930fd 100644 --- a/usr/src/uts/common/inet/ipnet/ipnet.c +++ b/usr/src/uts/common/inet/ipnet/ipnet.c @@ -1428,6 +1428,14 @@ ipnet_add_ifaddr(uint64_t lif, ipnetif_t *ipnetif, net_handle_t nd) break; } + /* + * The zoneid stored in ipnetif_t needs to correspond to the actual + * zone the address is being used in. This facilitates finding the + * correct netstack_t pointer, amongst other things, later. + */ + if (zoneid == ALL_ZONES) + zoneid = GLOBAL_ZONEID; + mutex_enter(&ipnetif->if_addr_lock); if (zoneid != ipnetif->if_zoneid) { ipnetif_t *ifp2; |