diff options
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/svc/startd/graph.c | 3 | ||||
| -rw-r--r-- | usr/src/cmd/zpool/zpool_main.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/usr/src/cmd/svc/startd/graph.c b/usr/src/cmd/svc/startd/graph.c index c8e0872ff8..5a4e933220 100644 --- a/usr/src/cmd/svc/startd/graph.c +++ b/usr/src/cmd/svc/startd/graph.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2015, Syneto S.R.L. All rights reserved. */ /* @@ -2591,7 +2592,7 @@ process_dependency_pg(scf_propertygroup_t *pg, struct deppg_info *info) fmri_sz = strlen(info->v->gv_name) + 1 + len + 1; fmri = startd_alloc(fmri_sz); - (void) snprintf(fmri, max_scf_name_size, "%s>%s", info->v->gv_name, + (void) snprintf(fmri, fmri_sz, "%s>%s", info->v->gv_name, pg_name); /* Validate the pg before modifying the graph */ diff --git a/usr/src/cmd/zpool/zpool_main.c b/usr/src/cmd/zpool/zpool_main.c index 855ec12c17..f0973cca93 100644 --- a/usr/src/cmd/zpool/zpool_main.c +++ b/usr/src/cmd/zpool/zpool_main.c @@ -708,6 +708,8 @@ zpool_do_create(int argc, char **argv) enable_all_pool_feat = B_FALSE; } } + if (zpool_name_to_prop(optarg) == ZPOOL_PROP_ALTROOT) + altroot = propval; break; case 'O': if ((propval = strchr(optarg, '=')) == NULL) { |