Browse code

Revert "Make plugins dir private."

This reverts commit 0c2821d6f2de692d105e50a399daa65169697cca.

Due to other changes this is no longer needed and resolves some other
issues with plugins.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

Brian Goff authored on 2017/12/14 05:33:15
Showing 3 changed files
... ...
@@ -111,11 +111,6 @@ func NewManager(config ManagerConfig) (*Manager, error) {
111 111
 			return nil, errors.Wrapf(err, "failed to mkdir %v", dirName)
112 112
 		}
113 113
 	}
114
-
115
-	if err := setupRoot(manager.config.Root); err != nil {
116
-		return nil, err
117
-	}
118
-
119 114
 	var err error
120 115
 	manager.executor, err = config.CreateExecutor(manager)
121 116
 	if err != nil {
... ...
@@ -159,13 +159,6 @@ func shutdownPlugin(p *v2.Plugin, c *controller, executor Executor) {
159 159
 	}
160 160
 }
161 161
 
162
-func setupRoot(root string) error {
163
-	if err := mount.MakePrivate(root); err != nil {
164
-		return errors.Wrap(err, "error setting plugin manager root to private")
165
-	}
166
-	return nil
167
-}
168
-
169 162
 func (pm *Manager) disable(p *v2.Plugin, c *controller) error {
170 163
 	if !p.IsEnabled() {
171 164
 		return errors.Wrap(errDisabled(p.Name()), "plugin is already disabled")
... ...
@@ -194,7 +187,6 @@ func (pm *Manager) Shutdown() {
194 194
 			shutdownPlugin(p, c, pm.executor)
195 195
 		}
196 196
 	}
197
-	mount.Unmount(pm.config.Root)
198 197
 }
199 198
 
200 199
 func (pm *Manager) upgradePlugin(p *v2.Plugin, configDigest digest.Digest, blobsums []digest.Digest, tmpRootFSDir string, privileges *types.PluginPrivileges) (err error) {
... ...
@@ -26,5 +26,3 @@ func (pm *Manager) restore(p *v2.Plugin) error {
26 26
 // Shutdown plugins
27 27
 func (pm *Manager) Shutdown() {
28 28
 }
29
-
30
-func setupRoot(root string) error { return nil }