diff options
| author | Robert Mustacchi <rm@joyent.com> | 2019-01-15 21:35:50 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2019-01-28 06:30:32 +0000 |
| commit | 672fc84a1840ce8ef60fc752e9ea374723d1135a (patch) | |
| tree | c5930c6d028555e52fb42b74fff23794b7f11231 /usr/src/pkg/manifests/service-fault-management.mf | |
| parent | 31b6814e52e5d603c18d8d2143eb2a8a660249c8 (diff) | |
| download | illumos-joyent-672fc84a1840ce8ef60fc752e9ea374723d1135a.tar.gz | |
10242 Project Tiresias: USB topology
10243 topo_node_label_set() should take a const char* instead of char*
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Rob Johnston <rob.johnston@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/pkg/manifests/service-fault-management.mf')
| -rw-r--r-- | usr/src/pkg/manifests/service-fault-management.mf | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/usr/src/pkg/manifests/service-fault-management.mf b/usr/src/pkg/manifests/service-fault-management.mf index 10fee761bf..d651843032 100644 --- a/usr/src/pkg/manifests/service-fault-management.mf +++ b/usr/src/pkg/manifests/service-fault-management.mf @@ -572,6 +572,7 @@ file path=usr/lib/fm/topo/plugins/ipmi.so mode=0555 file path=usr/lib/fm/topo/plugins/nic.so mode=0555 file path=usr/lib/fm/topo/plugins/ses.so mode=0555 file path=usr/lib/fm/topo/plugins/smbios.so mode=0555 +file path=usr/lib/fm/topo/plugins/usb.so mode=0555 file path=usr/lib/fm/topo/plugins/xfp.so mode=0555 # # Dictionaries, whether they are hardware-specific or not, are @@ -767,6 +768,9 @@ $(i386_ONLY)file \ path=usr/platform/i86pc/lib/fm/topo/maps/SSG-2028R-ACR24L-slot-hc-topology.xml \ mode=0444 $(i386_ONLY)file \ + path=usr/platform/i86pc/lib/fm/topo/maps/SSG-2028R-ACR24L-usb.usbtopo \ + mode=0444 +$(i386_ONLY)file \ path=usr/platform/i86pc/lib/fm/topo/maps/SSG-2029P-ACR24L-chassis-hc-topology.xml \ mode=0444 $(i386_ONLY)file \ @@ -779,6 +783,9 @@ $(i386_ONLY)file \ path=usr/platform/i86pc/lib/fm/topo/maps/SSG-2029P-ACR24L-slot-hc-topology.xml \ mode=0444 $(i386_ONLY)file \ + path=usr/platform/i86pc/lib/fm/topo/maps/SSG-2029P-ACR24L-usb.usbtopo \ + mode=0444 +$(i386_ONLY)file \ path=usr/platform/i86pc/lib/fm/topo/maps/SSG-6049P-E1CR36L-chassis-hc-topology.xml \ mode=0444 $(i386_ONLY)file \ @@ -788,6 +795,9 @@ $(i386_ONLY)file \ path=usr/platform/i86pc/lib/fm/topo/maps/SSG-6049P-E1CR36L-slot-hc-topology.xml \ mode=0444 $(i386_ONLY)file \ + path=usr/platform/i86pc/lib/fm/topo/maps/SSG-6049P-E1CR36L-usb.usbtopo \ + mode=0444 +$(i386_ONLY)file \ path=usr/platform/i86pc/lib/fm/topo/maps/Sun-Fire-X4200-M2-disk-hc-topology.xml \ mode=0444 $(i386_ONLY)file \ @@ -1021,21 +1031,34 @@ $(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/fm/fmd/plugins/etm.so \ target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so $(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins/etm.so \ target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so +$(i386_ONLY)link \ + path=usr/platform/i86pc/lib/fm/topo/maps/Joyent-Compute-Platform-3101-hc-topology.xml \ + target=SSG-2028R-ACR24L-hc-topology.xml # # symlinks for paticular topo maps # + $(i386_ONLY)link \ - path=usr/platform/i86pc/lib/fm/topo/maps/Joyent-Compute-Platform-3101-hc-topology.xml \ - target=SSG-2028R-ACR24L-hc-topology.xml + path=usr/platform/i86pc/lib/fm/topo/maps/Joyent-Compute-Platform-3101-usb.usbtopo \ + target=SSG-2028R-ACR24L-usb.usbtopo $(i386_ONLY)link \ path=usr/platform/i86pc/lib/fm/topo/maps/Joyent-Compute-Platform-3102-hc-topology.xml \ target=SSG-2028R-ACR24L-hc-topology.xml $(i386_ONLY)link \ + path=usr/platform/i86pc/lib/fm/topo/maps/Joyent-Compute-Platform-3102-usb.usbtopo \ + target=SSG-2028R-ACR24L-usb.usbtopo +$(i386_ONLY)link \ path=usr/platform/i86pc/lib/fm/topo/maps/Joyent-Compute-Platform-3302-hc-topology.xml \ target=Joyent-Compute-Platform-3301-hc-topology.xml $(i386_ONLY)link \ path=usr/platform/i86pc/lib/fm/topo/maps/Joyent-M12G5-hc-topology.xml \ target=SSG-2029P-ACR24L-hc-topology.xml $(i386_ONLY)link \ + path=usr/platform/i86pc/lib/fm/topo/maps/Joyent-M12G5-usb.usbtopo \ + target=SSG-2029P-ACR24L-usb.usbtopo +$(i386_ONLY)link \ path=usr/platform/i86pc/lib/fm/topo/maps/Joyent-S10G5-hc-topology.xml \ target=SSG-6049P-E1CR36L-hc-topology.xml +$(i386_ONLY)link \ + path=usr/platform/i86pc/lib/fm/topo/maps/Joyent-S10G5-usb.usbtopo \ + target=SSG-6049P-E1CR36L-usb.usbtopo |