From ca3224687ba37b4ccc9bf925d6df4c996d56d573 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Sun, 13 Apr 2014 23:33:25 +0000 Subject: [PATCH] Move apparmor to top level pkg Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- {libcontainer/apparmor => apparmor}/apparmor.go | 0 {libcontainer/apparmor => apparmor}/apparmor_disabled.go | 0 {libcontainer/apparmor => apparmor}/setup.go | 0 libcontainer/nsinit/init.go | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename {libcontainer/apparmor => apparmor}/apparmor.go (100%) rename {libcontainer/apparmor => apparmor}/apparmor_disabled.go (100%) rename {libcontainer/apparmor => apparmor}/setup.go (100%) diff --git a/libcontainer/apparmor/apparmor.go b/apparmor/apparmor.go similarity index 100% rename from libcontainer/apparmor/apparmor.go rename to apparmor/apparmor.go diff --git a/libcontainer/apparmor/apparmor_disabled.go b/apparmor/apparmor_disabled.go similarity index 100% rename from libcontainer/apparmor/apparmor_disabled.go rename to apparmor/apparmor_disabled.go diff --git a/libcontainer/apparmor/setup.go b/apparmor/setup.go similarity index 100% rename from libcontainer/apparmor/setup.go rename to apparmor/setup.go diff --git a/libcontainer/nsinit/init.go b/libcontainer/nsinit/init.go index b6c02ea..0e85c0e 100644 --- a/libcontainer/nsinit/init.go +++ b/libcontainer/nsinit/init.go @@ -8,9 +8,9 @@ import ( "runtime" "syscall" + "github.com/dotcloud/docker/pkg/apparmor" "github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/capabilities" "github.com/dotcloud/docker/pkg/libcontainer/network" "github.com/dotcloud/docker/pkg/libcontainer/utils"