From 6f40e38fe79ea829e8803cbb6d68ed166db541c7 Mon Sep 17 00:00:00 2001
From: Jerry Jelinek <jerry.jelinek@joyent.com>
Date: Tue, 29 Sep 2015 23:00:29 +0000
Subject: OS-4792 zlogin errors when trying to attach to a container using
 log-driver

---
 usr/src/cmd/zlogin/zlogin.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr/src')

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;
 		}
-- 
cgit v1.2.3