--- a/usr/src/pkg/manifests/service-network-dhcp.mf	Sun Jun 13 09:24:10 2010 +0800
+++ b/usr/src/pkg/manifests/service-network-dhcp.mf	Sat Jun 12 23:20:18 2010 -0700
@@ -20,22 +20,23 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/service/network/dhcp@$(PKGVERS)
 set name=pkg.description \
     value="Usr filesystem portion of the SunOS BOOTP/DHCP service, which uses the BOOT Protocol and/or Dynamic Host Configuration Protocol to provide network configuration parameters to BOOTP/DHCP clients. Administration utilities for the service are included."
 set name=pkg.summary value="BOOTP/DHCP Server Services"
-set name=info.classification value=org.opensolaris.category.2008:System/Services
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Services
 set name=variant.arch value=$(ARCH)
-set name=variant.opensolaris.zone value=global value=nonglobal
 dir path=etc group=sys
 dir path=etc/inet group=sys
 dir path=etc/init.d group=sys
 dir path=lib
 dir path=lib/svc
+dir path=lib/svc/manifest group=sys
+dir path=lib/svc/manifest/network group=sys
 dir path=usr group=sys
 dir path=usr/include
 dir path=usr/lib
@@ -45,9 +46,8 @@
 dir path=usr/lib/inet/dhcp/svc
 dir path=usr/lib/inet/dhcp/svcadm
 dir path=usr/sbin
-dir path=lib/svc/manifest group=sys
-dir path=lib/svc/manifest/network group=sys
 file path=etc/init.d/dhcp group=sys mode=0744
+file path=lib/svc/manifest/network/dhcp-server.xml group=sys mode=0444
 file path=usr/include/dhcp_svc_public.h
 file path=usr/lib/inet/dhcp/nsu/rfc2136.so.1
 file path=usr/lib/inet/dhcp/svc/ds_SUNWfiles.so.0
@@ -64,7 +64,6 @@
 file path=usr/sbin/dhcpconfig mode=0555
 file path=usr/sbin/dhtadm mode=0555
 file path=usr/sbin/pntadm mode=0555
-file path=lib/svc/manifest/network/dhcp-server.xml group=sys mode=0444
 legacy pkg=SUNWdhcsr arch=$(ARCH) category=system \
     desc="Root filesystem portion of the SunOS BOOTP/DHCP service, which uses the BOOT Protocol and/or Dynamic Host Configuration Protocol to provide network configuration parameters to BOOTP/DHCP clients. Administration utilities for the service are included." \
     hotline="Please contact your local service provider" \