diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-01-26 12:32:27 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-01-26 12:32:27 +0000 |
| commit | 8b69dec4f888a800a3f98316317a2bef0f8f61ee (patch) | |
| tree | 079dd9d440f57234e954babbb54a2aae000164fd /usr/src/pkg/manifests/service-fault-management.mf | |
| parent | d87038076be7e2d00abcceefeb7aee8111433e80 (diff) | |
| parent | 95cb2e31c87e3febe7315833e075c1b16451e44c (diff) | |
| download | illumos-joyent-8b69dec4f888a800a3f98316317a2bef0f8f61ee.tar.gz | |
[illumos-gate merge]
commit 95cb2e31c87e3febe7315833e075c1b16451e44c
8685 uts and mdb: do not build 32bit kernel
commit 141fdc8db8933e5c2d4fe6a0f5ee25c59f0a0231
8987 bootadm: add bootfile fallback to unix
commit 9aa2d72c0b7ffd836b0f633a523c698cfa854256
8986 loader: try_multiple_kernels does not try multiple kernels
Conflicts:
usr/src/uts/intel/Makefile.intel
Diffstat (limited to 'usr/src/pkg/manifests/service-fault-management.mf')
| -rw-r--r-- | usr/src/pkg/manifests/service-fault-management.mf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/usr/src/pkg/manifests/service-fault-management.mf b/usr/src/pkg/manifests/service-fault-management.mf index 65d6015fbd..0198121c53 100644 --- a/usr/src/pkg/manifests/service-fault-management.mf +++ b/usr/src/pkg/manifests/service-fault-management.mf @@ -263,7 +263,6 @@ file path=etc/net-snmp/snmp/mibs/SUN-IREPORT-MIB.mib \ # driver is global-zone only # 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 # |