diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2011-12-06 19:58:04 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2011-12-06 19:58:04 +0000 |
| commit | 88321d496c6e4723ed1d256323dc226c6d591a3c (patch) | |
| tree | 66e907d1e58ed05e446a2dda0892c308626052a0 | |
| parent | 0d996ac8074001c571beb847b2e1447ec472448c (diff) | |
| download | illumos-joyent-88321d496c6e4723ed1d256323dc226c6d591a3c.tar.gz | |
OS-774 remove zoneadm install -U when no longer needed
| -rw-r--r-- | usr/src/cmd/zoneadm/zoneadm.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/usr/src/cmd/zoneadm/zoneadm.c b/usr/src/cmd/zoneadm/zoneadm.c index 9d9d782d0a..b63c448d9c 100644 --- a/usr/src/cmd/zoneadm/zoneadm.c +++ b/usr/src/cmd/zoneadm/zoneadm.c @@ -2913,7 +2913,6 @@ install_func(int argc, char *argv[]) boolean_t brand_help = B_FALSE; boolean_t do_dataset = B_TRUE; char opts[128]; - char *new_uuid = NULL; if (target_zone == NULL) { sub_usage(SHELP_INSTALL, CMD_INSTALL); @@ -2956,7 +2955,7 @@ install_func(int argc, char *argv[]) if (postcmdbuf[0] != '\0') do_postinstall = B_TRUE; - (void) strcpy(opts, "?U:x:"); + (void) strcpy(opts, "?x:"); /* * Fetch the list of recognized command-line options from * the brand configuration file. @@ -2988,10 +2987,6 @@ install_func(int argc, char *argv[]) } /* Ignore unknown options - may be brand specific. */ break; - case 'U': - new_uuid = optarg; - continue; /* internal arg, don't pass thru */ - break; case 'x': if (strcmp(optarg, "nodataset") == 0) { do_dataset = B_FALSE; @@ -3077,13 +3072,6 @@ install_func(int argc, char *argv[]) goto done; } - if (new_uuid != NULL && - (err = zonecfg_set_uuid(target_zone, zonepath, new_uuid) != Z_OK)) { - errno = err; - zperror2(target_zone, gettext("could not set UUID")); - goto done; - } - if (do_postinstall) { status = do_subproc(postcmdbuf); |