diff options
| author | Truong Q. Nguyen <Tony.Q.Nguyen@oracle.com> | 2010-08-15 15:24:34 -0700 |
|---|---|---|
| committer | Truong Q. Nguyen <Tony.Q.Nguyen@oracle.com> | 2010-08-15 15:24:34 -0700 |
| commit | 293e3ab30a546cd932ee22f9d54b3979fcb52095 (patch) | |
| tree | a509045412a652acdf3f37c300a1fbe5bd617783 /usr/src/cmd/svc/svccfg/svccfg_engine.c | |
| parent | d996f1b8696f9ad4e65c250b117c690729ca40bf (diff) | |
| download | illumos-joyent-293e3ab30a546cd932ee22f9d54b3979fcb52095.tar.gz | |
6974613 manifest-import can be restructured to allow importing to alternate repository
6974718 svccfg core dump after upgrading to snv_145
Diffstat (limited to 'usr/src/cmd/svc/svccfg/svccfg_engine.c')
| -rw-r--r-- | usr/src/cmd/svc/svccfg/svccfg_engine.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/cmd/svc/svccfg/svccfg_engine.c b/usr/src/cmd/svc/svccfg/svccfg_engine.c index c05100a502..6d8e9d1c9b 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_engine.c +++ b/usr/src/cmd/svc/svccfg/svccfg_engine.c @@ -725,7 +725,8 @@ engine_import(uu_list_t *args) } /* Get list of manifests that we should import for this path. */ - if ((count = find_manifests(file, &manifests, fm_flags)) < 0) { + if ((count = find_manifests(g_hndl, file, &manifests, + fm_flags)) < 0) { if (isdir) { semerr(gettext("Could not hash directory %s\n"), file); @@ -929,7 +930,9 @@ engine_apply(const char *file, int apply_changes) } /* Get list of profiles to be applied. */ - if ((profile_count = find_manifests(file, &profiles, fm_flags)) < 0) { + if ((profile_count = find_manifests(g_hndl, file, &profiles, + fm_flags)) < 0) { + if (isdir) { semerr(gettext("Could not hash directory %s\n"), file); } else { |