diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-12-15 12:29:17 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-12-15 12:29:17 +0000 |
| commit | d0702bed07529b68e296ae261377ca44f1f84943 (patch) | |
| tree | 3d7ec2160684cfe44e1d613dbd476c21aed21373 /usr/src | |
| parent | 761de6df927d16b6a8524c7325ea9208957bff17 (diff) | |
| parent | b5254d6ec12a0443b3a431a7e656f38e4ac98b2e (diff) | |
| download | illumos-joyent-d0702bed07529b68e296ae261377ca44f1f84943.tar.gz | |
[illumos-gate merge]
commit b5254d6ec12a0443b3a431a7e656f38e4ac98b2e
5468 Missing dependencies in lib/Makefile (fix scsi)
commit 003a15e8c33d09669429b8c89e5832aac8b92828
6506 wrong prop_pattern name in restarter service manifest
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/svc/milestone/restarter.xml | 3 | ||||
| -rw-r--r-- | usr/src/lib/Makefile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/cmd/svc/milestone/restarter.xml b/usr/src/cmd/svc/milestone/restarter.xml index 0d10c5881b..4d66ab3043 100644 --- a/usr/src/cmd/svc/milestone/restarter.xml +++ b/usr/src/cmd/svc/milestone/restarter.xml @@ -2,6 +2,7 @@ <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright 2015 Nexenta Systems, Inc. All rights reserved. CDDL HEADER START @@ -391,7 +392,7 @@ Start no services. </value> </constraints> </prop_pattern> - <prop_pattern name='info_event_all' type='boolean' + <prop_pattern name='info_events_all' type='boolean' required='false'> <description> <loctext xml:lang='C'> diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index 2553d515e1..9c2ae475c9 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -701,7 +701,7 @@ pyzfs: libzfs raidcfg_plugins: libraidcfg librcm libcfgadm libpicl libpicltree rpcsec_gss: libgss sasl_plugins: pkcs11 libgss libsasl -scsi: libfru libumem +scsi: libfru libumem libdevid libdevinfo smbsrv: libxnet libpthread librt libshare libidmap pkcs11 libsqlite \ libcryptoutil libreparse libcmdutils libresolv2 libsmbfs \ libuuid libfakekernel libads libgss libldap5 krb5 |