diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/zoneadm/zones.xml | 10 | ||||
| -rw-r--r-- | usr/src/uts/common/os/zone.c | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/usr/src/cmd/zoneadm/zones.xml b/usr/src/cmd/zoneadm/zones.xml index c14ec7ed79..91e02ce7d6 100644 --- a/usr/src/cmd/zoneadm/zones.xml +++ b/usr/src/cmd/zoneadm/zones.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- - Copyright 2005 Sun Microsystems, Inc. All rights reserved. + Copyright 2006 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. CDDL HEADER START @@ -34,6 +34,10 @@ <service_bundle type='manifest' name='SUNWzoner:zones'> +<!-- + The only effect of this service is to causes zones with the + "autoboot" property set to "true" to boot at system startup. +--> <service name='system/zones' type='service' @@ -74,13 +78,13 @@ <template> <common_name> <loctext xml:lang='C'> - Solaris zones + Zones autoboot </loctext> </common_name> <documentation> <manpage title='zones' section='5' manpath='/usr/share/man' /> <manpage - title='zoneadm' + title='zonecfg' section='1M' manpath='/usr/share/man' /> </documentation> diff --git a/usr/src/uts/common/os/zone.c b/usr/src/uts/common/os/zone.c index 9236430b40..c4bb5af10c 100644 --- a/usr/src/uts/common/os/zone.c +++ b/usr/src/uts/common/os/zone.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -3905,6 +3905,7 @@ zone(int cmd, void *arg1, void *arg2, void *arg3, void *arg4) zs.zone_privs = (const struct priv_set *) (unsigned long)zs32.zone_privs; + zs.zone_privssz = zs32.zone_privssz; zs.rctlbuf = (caddr_t)(unsigned long)zs32.rctlbuf; zs.rctlbufsz = zs32.rctlbufsz; zs.zfsbuf = (caddr_t)(unsigned long)zs32.zfsbuf; |