diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2013-06-28 19:48:23 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2013-06-28 19:48:23 +0000 |
| commit | b40f3bdaba9e3416d927917bb02c7897d346adbd (patch) | |
| tree | 1caca701b6c81a600894e3fd25c6fc664c0d8e16 | |
| parent | 8600f0f70fcb0c6292d7a7f0e4e0d4eaf61f0d9f (diff) | |
| download | illumos-joyent-b40f3bdaba9e3416d927917bb02c7897d346adbd.tar.gz | |
OS-2328 zone boot failed: could not open master side of zone console
| -rw-r--r-- | usr/src/cmd/zoneadmd/zcons.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr/src/cmd/zoneadmd/zcons.c b/usr/src/cmd/zoneadmd/zcons.c index 70b2f614c8..84504d86e1 100644 --- a/usr/src/cmd/zoneadmd/zcons.c +++ b/usr/src/cmd/zoneadmd/zcons.c @@ -117,6 +117,8 @@ #define CONSOLE_SOCKPATH ZONES_TMPDIR "/%s.console_sock" +#define ZCONS_RETRY 10 + static int serverfd = -1; /* console server unix domain socket fd */ char boot_args[BOOTARGS_MAX]; char bad_boot_arg[BOOTARGS_MAX]; @@ -414,7 +416,7 @@ devlinks: */ (void) snprintf(conspath, sizeof (conspath), "/dev/zcons/%s/%s", zone_name, ZCONS_MASTER_NAME); - for (i = 0; i < 5; i++) { + for (i = 0; i < ZCONS_RETRY; i++) { masterfd = open(conspath, O_RDWR | O_NOCTTY); if (masterfd >= 0 || errno != ENOENT) break; @@ -428,7 +430,7 @@ devlinks: (void) snprintf(conspath, sizeof (conspath), "/dev/zcons/%s/%s", zone_name, ZCONS_SLAVE_NAME); - for (i = 0; i < 5; i++) { + for (i = 0; i < ZCONS_RETRY; i++) { slavefd = open(conspath, O_RDWR | O_NOCTTY); if (slavefd >= 0 || errno != ENOENT) break; @@ -445,7 +447,7 @@ devlinks: * everything plumbed up yet due to heavy zone startup load. Wait for * 1 sec. and retry a few times before we fail to boot the zone. */ - for (i = 0; i < 5; i++) { + for (i = 0; i < ZCONS_RETRY; i++) { if (ioctl(masterfd, ZC_HOLDSLAVE, (caddr_t)(intptr_t)slavefd) == 0) { rv = 0; |