diff options
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/cmd/dlmgmtd/dlmgmt_main.c | 4 | ||||
| -rw-r--r-- | usr/src/cmd/zoneadmd/zoneadmd.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_main.c b/usr/src/cmd/dlmgmtd/dlmgmt_main.c index b9c0ee6457..e0c179cf5e 100644 --- a/usr/src/cmd/dlmgmtd/dlmgmt_main.c +++ b/usr/src/cmd/dlmgmtd/dlmgmt_main.c @@ -22,7 +22,7 @@ /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * Copyright 2011 Joyent, Inc. All rights reserved. + * Copyright 2012 Joyent, Inc. All rights reserved. */ /* @@ -255,6 +255,8 @@ again: case ZONE_IS_DEAD: /* FALLTHRU */ continue; + default: + break; } if ((res = dlmgmt_zone_init(zids[i])) != 0) { (void) fprintf(stderr, "zone (%ld) init error %s", diff --git a/usr/src/cmd/zoneadmd/zoneadmd.c b/usr/src/cmd/zoneadmd/zoneadmd.c index 16471fdf9f..a5b3c90e5b 100644 --- a/usr/src/cmd/zoneadmd/zoneadmd.c +++ b/usr/src/cmd/zoneadmd/zoneadmd.c @@ -1532,6 +1532,7 @@ server(void *cookie, char *args, size_t alen, door_desc_t *dp, rval = 0; break; case Z_BOOT: + case Z_FORCEBOOT: (void) strlcpy(boot_args, zargp->bootbuf, sizeof (boot_args)); eventstream_write(Z_EVT_ZONE_BOOTING); @@ -1557,6 +1558,7 @@ server(void *cookie, char *args, size_t alen, door_desc_t *dp, case Z_REBOOT: case Z_NOTE_UNINSTALLING: case Z_MOUNT: + case Z_FORCEMOUNT: case Z_UNMOUNT: if (kernelcall) /* Invalid; can't happen */ abort(); @@ -1605,6 +1607,7 @@ server(void *cookie, char *args, size_t alen, door_desc_t *dp, eventstream_write(Z_EVT_ZONE_HALTED); break; case Z_BOOT: + case Z_FORCEBOOT: /* * We could have two clients racing to boot this * zone; the second client loses, but his request @@ -1648,6 +1651,7 @@ server(void *cookie, char *args, size_t alen, door_desc_t *dp, break; case Z_NOTE_UNINSTALLING: case Z_MOUNT: + case Z_FORCEMOUNT: case Z_UNMOUNT: zerror(zlogp, B_FALSE, "%s operation is invalid " "for zones in state '%s'", z_cmd_name(cmd), |