diff options
| author | Susan Kamm-Worrell <Susan.Kamm-Worrell@Sun.COM> | 2010-08-16 11:59:54 -0700 |
|---|---|---|
| committer | Susan Kamm-Worrell <Susan.Kamm-Worrell@Sun.COM> | 2010-08-16 11:59:54 -0700 |
| commit | 2a8b76b292edb1417feb26be130d62bf24f6f812 (patch) | |
| tree | 042b170ed9d30e24eddc1c217d21a491ea9a9791 /usr/src/cmd/zoneadmd | |
| parent | 99389cdeb9c9d0c12fa16c043aa9d1c384f05a05 (diff) | |
| download | illumos-gate-2a8b76b292edb1417feb26be130d62bf24f6f812.tar.gz | |
6969507 mount of ipkg zone in alternate root fails
Diffstat (limited to 'usr/src/cmd/zoneadmd')
| -rw-r--r-- | usr/src/cmd/zoneadmd/zoneadmd.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/usr/src/cmd/zoneadmd/zoneadmd.c b/usr/src/cmd/zoneadmd/zoneadmd.c index 743370c1ad..fe7719bbe1 100644 --- a/usr/src/cmd/zoneadmd/zoneadmd.c +++ b/usr/src/cmd/zoneadmd/zoneadmd.c @@ -20,8 +20,7 @@ */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. */ /* @@ -457,12 +456,14 @@ static int brand_prestatechg(zlog_t *zlogp, int state, int cmd) { char cmdbuf[2 * MAXPATHLEN]; + const char *altroot; if (pre_statechg_hook[0] == '\0') return (0); - if (snprintf(cmdbuf, sizeof (cmdbuf), "%s %d %d", pre_statechg_hook, - state, cmd) > sizeof (cmdbuf)) + altroot = zonecfg_get_root(); + if (snprintf(cmdbuf, sizeof (cmdbuf), "%s %d %d %s", pre_statechg_hook, + state, cmd, altroot) > sizeof (cmdbuf)) return (-1); if (do_subproc(zlogp, cmdbuf, NULL) != 0) @@ -478,12 +479,14 @@ static int brand_poststatechg(zlog_t *zlogp, int state, int cmd) { char cmdbuf[2 * MAXPATHLEN]; + const char *altroot; if (post_statechg_hook[0] == '\0') return (0); - if (snprintf(cmdbuf, sizeof (cmdbuf), "%s %d %d", post_statechg_hook, - state, cmd) > sizeof (cmdbuf)) + altroot = zonecfg_get_root(); + if (snprintf(cmdbuf, sizeof (cmdbuf), "%s %d %d %s", post_statechg_hook, + state, cmd, altroot) > sizeof (cmdbuf)) return (-1); if (do_subproc(zlogp, cmdbuf, NULL) != 0) |