diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-09-29 23:00:29 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-09-29 23:00:29 +0000 |
| commit | 6f40e38fe79ea829e8803cbb6d68ed166db541c7 (patch) | |
| tree | a6612038ac1431bc629eb8688785f229935ed6b3 /usr/src | |
| parent | 389b367d6cf9f6f9f7a8f51edebd0e69bd08ea5e (diff) | |
| download | illumos-joyent-6f40e38fe79ea829e8803cbb6d68ed166db541c7.tar.gz | |
OS-4792 zlogin errors when trying to attach to a container using log-driver
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/zlogin/zlogin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/cmd/zlogin/zlogin.c b/usr/src/cmd/zlogin/zlogin.c index c829459e50..b48c446ffd 100644 --- a/usr/src/cmd/zlogin/zlogin.c +++ b/usr/src/cmd/zlogin/zlogin.c @@ -1878,7 +1878,8 @@ zlog_mode_logging(char *zonename) goto done; while (zonecfg_getattrent(handle, &attr) == Z_OK) { if (strcmp("zlog-mode", attr.zone_attr_name) == 0) { - if (strncmp("log", attr.zone_attr_value, 3) == 0) + if (strncmp("log", attr.zone_attr_value, 3) == 0 || + strncmp("nolog", attr.zone_attr_value, 5) == 0) lm = B_TRUE; break; } |