diff options
| author | Bill Pijewski <wdp@joyent.com> | 2012-05-08 13:15:09 -0700 |
|---|---|---|
| committer | Bill Pijewski <wdp@joyent.com> | 2012-05-08 13:24:03 -0700 |
| commit | 884a9ad31aa38548e68cd45431e591bce9683ed5 (patch) | |
| tree | ec316cb2677317c1216af495b29ec6258288e916 /usr/src/lib/libshare/nfs/libshare_nfs.c | |
| parent | 48ce030099319e2d5a4d76be4debf6cabfe618d2 (diff) | |
| download | illumos-joyent-884a9ad31aa38548e68cd45431e591bce9683ed5.tar.gz | |
STOR-54 warnings when creating a delegated ZFS dataset in a non-global zone
OS-493 NFS client 'entity not found' error when mounting
Diffstat (limited to 'usr/src/lib/libshare/nfs/libshare_nfs.c')
| -rw-r--r-- | usr/src/lib/libshare/nfs/libshare_nfs.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/usr/src/lib/libshare/nfs/libshare_nfs.c b/usr/src/lib/libshare/nfs/libshare_nfs.c index 8d18ecee95..67dc968bad 100644 --- a/usr/src/lib/libshare/nfs/libshare_nfs.c +++ b/usr/src/lib/libshare/nfs/libshare_nfs.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Joyent, Inc. All rights reserved. */ /* @@ -2660,9 +2661,16 @@ nfs_init() ret = initprotofromsmf(); if (ret != SA_OK) { - (void) printf(dgettext(TEXT_DOMAIN, - "NFS plugin problem with SMF repository: %s\n"), - sa_errorstr(ret)); + /* + * This is a workaround. See the comment in + * cmd/fs.d/nfs/lib/smfcfg.c for an explanation. + */ + if (getzoneid() == GLOBAL_ZONEID || + ret != SCF_ERROR_NOT_FOUND) { + (void) printf(dgettext(TEXT_DOMAIN, + "NFS plugin problem with SMF repository: %s\n"), + sa_errorstr(ret)); + } ret = SA_OK; } add_defaults(); |