[lxc-devel] [lxd/master] apparmor: Only turn on stacking for >= 1.2

stgraber on Github lxc-bot at linuxcontainers.org
Tue Sep 27 19:09:16 UTC 2016


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160927/19864522/attachment.bin>
-------------- next part --------------
From dab85f6ec1033f73ed8ce661482fcddb10f70aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 27 Sep 2016 15:07:48 -0400
Subject: [PATCH] apparmor: Only turn on stacking for >= 1.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/daemon.go | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lxd/daemon.go b/lxd/daemon.go
index 586c432..1e4f7f5 100644
--- a/lxd/daemon.go
+++ b/lxd/daemon.go
@@ -646,7 +646,8 @@ func (d *Daemon) Init() error {
 			content := string(contentBytes)
 
 			parts := strings.Split(strings.TrimSpace(content), ".")
-			if len(parts) != 2 {
+
+			if len(parts) == 0 {
 				shared.LogWarn("unknown apparmor domain version", log.Ctx{"version": content})
 				return false
 			}
@@ -657,13 +658,16 @@ func (d *Daemon) Init() error {
 				return false
 			}
 
-			minor, err := strconv.Atoi(parts[1])
-			if err != nil {
-				shared.LogWarn("unknown apparmor domain version", log.Ctx{"version": content})
-				return false
+			minor := 0
+			if len(parts) == 2 {
+				minor, err = strconv.Atoi(parts[1])
+				if err != nil {
+					shared.LogWarn("unknown apparmor domain version", log.Ctx{"version": content})
+					return false
+				}
 			}
 
-			return major >= 1 && minor >= 1
+			return major >= 1 && minor >= 2
 		}
 
 		aaStacking = canStack()


More information about the lxc-devel mailing list