summaryrefslogtreecommitdiff
path: root/usr/src/cmd/zoneadm/zones.xml
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/zoneadm/zones.xml')
-rw-r--r--usr/src/cmd/zoneadm/zones.xml23
1 files changed, 22 insertions, 1 deletions
diff --git a/usr/src/cmd/zoneadm/zones.xml b/usr/src/cmd/zoneadm/zones.xml
index 9c8e305f89..b094bc660b 100644
--- a/usr/src/cmd/zoneadm/zones.xml
+++ b/usr/src/cmd/zoneadm/zones.xml
@@ -54,11 +54,32 @@
<service_fmri value='svc:/milestone/multi-user-server' />
</dependency>
+ <!--
+ Until overlay device creation is moved out of the zone
+ state-change script, zones must be dependent on varpd's
+ successful launch.
+ -->
+ <dependency
+ name='varpd'
+ type='service'
+ grouping='require_all'
+ restart_on='none'>
+ <service_fmri value='svc:/network/varpd' />
+ </dependency>
+
+ <dependency
+ name='metadata'
+ type='service'
+ grouping='require_all'
+ restart_on='none'>
+ <service_fmri value='svc:/system/smartdc/metadata' />
+ </dependency>
+
<exec_method
type='method'
name='start'
exec='/lib/svc/method/svc-zones %m'
- timeout_seconds='60'>
+ timeout_seconds='0'>
</exec_method>
<!--