diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-05-28 12:08:20 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-05-28 12:08:20 +0000 |
| commit | 875d2a359726f3c8cbb1d3aea07d338b78810b56 (patch) | |
| tree | 78236213079c47c39e4034f67077db22bd4a6bcb /usr/src/cmd | |
| parent | e69deeed01db5ab5784bcfe090f788f6bc6f574b (diff) | |
| parent | 09f79f7c66b85f056db11f58210dc6182c9b1aef (diff) | |
| download | illumos-joyent-20150528.tar.gz | |
[illumos-gate merge]20150528release-20150528
commit 09f79f7c66b85f056db11f58210dc6182c9b1aef
4418 svc.startd crash with a long instance name and more than one dependency
commit cb5842f8b0caaad0ed53535bd77042e933fdbafe
5909 ensure that shared snap names don't become too long after promotion
commit beddaa9ce797b9deaafc22b4f156d23f9b45c32d
5870 dmu_recv_end_check() leaks origin_head hold if error happens in drc_force branch
commit 5bae108fe2364722de3aa86e04966a0d33fd027a
5912 full stream can not be force-received into a dataset if it has a snapshot
commit c701fde6911c957e71b37aac4daf672bd828f4d7
5961 Fix stack overflow in zfs_create_fs
commit c423721f9bcd45c2409ef7b73fc103ac2889f9e9
5669 altroot not set in zpool create when specified with -o
commit 5897eb49ccde82d19214b71984f57935e7e313d1
5438 zfs_blkptr_verify should continue after zfs_panic_recover
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) { |