6932709 libc mountpoints shouldn't be tagged with preserve=

6948967 opensolaris.zone= persists in ON manifests, should be expunged
6948970 eval in pkg/Makefile masks pkgmogrify failures
6949340 Fix various zones related packaging oddities
6951274 most variant.opensolaris.zone and reboot-needed attributes could be added by rules
6954463 legacy, renamed SUNWiscsitgt and SUNWmms need to be obsoleted properly
6954897 README.pkg should be more helpful describing need for on-extra

1 files changed, 54 insertions, 34 deletions

diff --git a/usr/src/pkg/manifests/service-fault-management.mf b/usr/src/pkg/manifests/service-fault-management.mf
index 3b1d280708..db5917794a 100644
--- a/usr/src/pkg/manifests/service-fault-management.mf
+++ b/usr/src/pkg/manifests/service-fault-management.mf
@@ -20,17 +20,21 @@
 #
 
 #
-# 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.
 #
 
+#
+# The default for payload-bearing actions in this package is to appear in the
+# global zone only.  See the include file for greater detail, as well as
+# information about overriding the defaults.
+#
+<include global_zone_only_component>
 set name=pkg.fmri value=pkg:/service/fault-management@$(PKGVERS)
 set name=pkg.description value="Fault Management Daemon and Utilities"
 set name=pkg.summary value="Fault Management Daemon and Utilities"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=variant.arch value=$(ARCH)
-set name=variant.opensolaris.zone value=global value=nonglobal
 dir path=etc group=sys
 dir path=etc/fm group=sys
 dir path=etc/fm/fmd group=sys
@@ -97,7 +101,8 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/fmd
 $(sparc_ONLY)dir \
     path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/fmd/plugins
 $(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps
+$(sparc_ONLY)dir \
+    path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps
 $(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib
 $(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib/fm
 $(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/fmd
@@ -196,7 +201,7 @@ file path=etc/net-snmp/snmp/fmd-trapgen.conf mode=0600
 file path=etc/net-snmp/snmp/mibs/SUN-FM-MIB.mib
 file path=kernel/drv/$(ARCH64)/fm group=sys
 $(i386_ONLY)file path=kernel/drv/fm group=sys
-file path=kernel/drv/fm.conf group=sys reboot-needed=false
+file path=kernel/drv/fm.conf group=sys
 file path=usr/include/fm/diagcode.h
 file path=usr/include/fm/fmd_adm.h
 file path=usr/include/fm/fmd_agent.h
@@ -377,11 +382,13 @@ $(sparc_ONLY)file \
 $(sparc_ONLY)file \
     path=usr/platform/SUNW,Netra-CP3260/lib/fm/topo/maps/Netra-CP3260-hc-topology.xml \
     mode=0444
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins/etm.conf
+$(sparc_ONLY)file \
+    path=usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins/etm.conf
 $(sparc_ONLY)file \
     path=usr/platform/SUNW,Netra-T5220/lib/fm/topo/maps/Netra-T5220-hc-topology.xml \
     mode=0444
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins/etm.conf
+$(sparc_ONLY)file \
+    path=usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins/etm.conf
 $(sparc_ONLY)file \
     path=usr/platform/SUNW,Netra-T5440/lib/fm/topo/maps/Netra-T5440-hc-topology.xml \
     mode=0444
@@ -448,8 +455,8 @@ $(sparc_ONLY)file \
 $(sparc_ONLY)file \
     path=usr/platform/SUNW,Sun-Fire/lib/fm/topo/maps/Sun-Fire-hc-topology.xml \
     mode=0444
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire/lib/fm/topo/plugins/ioboard.so \
-    mode=0555
+$(sparc_ONLY)file \
+    path=usr/platform/SUNW,Sun-Fire/lib/fm/topo/plugins/ioboard.so mode=0555
 $(sparc_ONLY)file path=usr/platform/SUNW,T5140/lib/fm/fmd/plugins/etm.conf
 $(sparc_ONLY)file \
     path=usr/platform/SUNW,T5140/lib/fm/topo/maps/Sun-Blade-T6340-hc-topology.xml \
@@ -463,7 +470,8 @@ $(sparc_ONLY)file \
 $(sparc_ONLY)file \
     path=usr/platform/SUNW,T5140/lib/fm/topo/maps/T5440-hc-topology.xml \
     mode=0444
-$(sparc_ONLY)file path=usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins/etm.conf
+$(sparc_ONLY)file \
+    path=usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins/etm.conf
 $(sparc_ONLY)file \
     path=usr/platform/SUNW,USBRDT-5240/lib/fm/topo/maps/USBRDT-5240-hc-topology.xml \
     mode=0444
@@ -490,13 +498,14 @@ $(i386_ONLY)file \
     path=usr/platform/i86pc/lib/fm/topo/maps/Sun-Fire-X4600-M2-disk-hc-topology.xml \
     mode=0444
 $(i386_ONLY)file \
-    path=usr/platform/i86pc/lib/fm/topo/maps/chassis-hc-topology.xml mode=0444
+    path=usr/platform/i86pc/lib/fm/topo/maps/chassis-hc-topology.xml \
+    mode=0444
 $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/maps/chip-hc-topology.xml \
     mode=0444
 $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/maps/fan-hc-topology.xml \
     mode=0444
-$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/maps/i86pc-hc-topology.xml \
-    mode=0444
+$(i386_ONLY)file \
+    path=usr/platform/i86pc/lib/fm/topo/maps/i86pc-hc-topology.xml mode=0444
 $(i386_ONLY)file \
     path=usr/platform/i86pc/lib/fm/topo/maps/i86pc-legacy-hc-topology.xml \
     mode=0444
@@ -505,8 +514,10 @@ $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/maps/psu-hc-topology.xml \
 $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/chip.so mode=0555
 $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/hostbridge.so \
     mode=0555
-$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/pcibus.so mode=0555
-$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/x86pi.so mode=0555
+$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/pcibus.so \
+    mode=0555
+$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/x86pi.so \
+    mode=0555
 $(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/eft/fire.eft mode=0444
 $(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/eft/oberon.eft mode=0444
 $(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/eft/psycho.eft mode=0444
@@ -519,18 +530,20 @@ $(sparc_ONLY)file \
     path=usr/platform/sun4u/lib/fm/fmd/plugins/USII-io-diagnosis.so mode=0555
 $(sparc_ONLY)file \
     path=usr/platform/sun4u/lib/fm/fmd/plugins/cpumem-diagnosis.conf
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/fmd/plugins/cpumem-diagnosis.so \
-    mode=0555
+$(sparc_ONLY)file \
+    path=usr/platform/sun4u/lib/fm/fmd/plugins/cpumem-diagnosis.so mode=0555
 $(sparc_ONLY)file \
     path=usr/platform/sun4u/lib/fm/fmd/plugins/datapath-retire.conf
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/fmd/plugins/datapath-retire.so \
-    mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/fmd/plugins/fps-transport.conf
+$(sparc_ONLY)file \
+    path=usr/platform/sun4u/lib/fm/fmd/plugins/datapath-retire.so mode=0555
+$(sparc_ONLY)file \
+    path=usr/platform/sun4u/lib/fm/fmd/plugins/fps-transport.conf
 $(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/fmd/plugins/fps-transport.so \
     mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/maps/sun4u-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/plugins/chip.so mode=0555
+$(sparc_ONLY)file \
+    path=usr/platform/sun4u/lib/fm/topo/maps/sun4u-hc-topology.xml mode=0444
+$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/plugins/chip.so \
+    mode=0555
 $(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/plugins/hostbridge.so \
     mode=0555
 $(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/plugins/pcibus.so \
@@ -547,9 +560,10 @@ $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/vfncx.eft mode=0444
 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/zambezi.eft mode=0444
 $(sparc_ONLY)file \
     path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-diagnosis.conf
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-diagnosis.so \
-    mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-retire.conf
+$(sparc_ONLY)file \
+    path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-diagnosis.so mode=0555
+$(sparc_ONLY)file \
+    path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-retire.conf
 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-retire.so \
     mode=0555
 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/etm.conf
@@ -557,12 +571,14 @@ $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/etm.so mode=0555
 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/generic-mem.conf
 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/generic-mem.so \
     mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/maps/sun4v-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/chip.so mode=0555
+$(sparc_ONLY)file \
+    path=usr/platform/sun4v/lib/fm/topo/maps/sun4v-hc-topology.xml mode=0444
+$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/chip.so \
+    mode=0555
 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/cpuboard.so \
     mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/dimm.so mode=0555
+$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/dimm.so \
+    mode=0555
 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/hostbridge.so \
     mode=0555
 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/motherboard.so \
@@ -576,7 +592,8 @@ $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/platform-mem.so \
     mode=0555
 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/sun4vpi.so \
     mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/xaui.so mode=0555
+$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/xaui.so \
+    mode=0555
 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/zambezi.so \
     mode=0555
 file path=usr/sbin/fmadm mode=0555
@@ -617,9 +634,11 @@ link path=usr/lib/fm/libfmevent.so target=libfmevent.so.1
 $(sparc_ONLY)link path=usr/lib/fm/libldom.so target=libldom.so.1
 $(sparc_ONLY)link path=usr/lib/fm/libmdesc.so target=libmdesc.so.1
 link path=usr/lib/fm/libtopo.so target=libtopo.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins/etm.so \
+$(sparc_ONLY)link \
+    path=usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins/etm.so \
     target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins/etm.so \
+$(sparc_ONLY)link \
+    path=usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins/etm.so \
     target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins/etm.so \
     target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
@@ -634,7 +653,8 @@ $(sparc_ONLY)link \
 $(sparc_ONLY)link \
     path=usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd/plugins/etm.so \
     target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins/etm.so \
+$(sparc_ONLY)link \
+    path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins/etm.so \
     target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 $(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/fm/fmd/plugins/etm.so \
     target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so