1
=== modified file 'container/lxc/lxc.go'
2
--- container/lxc/lxc.go	2014-01-28 04:58:43 +0000
3
+++ container/lxc/lxc.go	2014-01-30 00:52:25 +0000
4
@@ -145,10 +145,12 @@
5
145
func (manager *containerManager) StopContainer(instance instance.Instance) error {
145
func (manager *containerManager) StopContainer(instance instance.Instance) error {
6
146
	name := string(instance.Id())
146
	name := string(instance.Id())
7
147
	lxcContainer := LxcObjectFactory.New(name)
147
	lxcContainer := LxcObjectFactory.New(name)
12
148
	// Remove the autostart link.
148
	if useRestartDir() {
13
149
	if err := os.Remove(restartSymlink(name)); err != nil {
149
		// Remove the autostart link.
14
150
		logger.Errorf("failed to remove restart symlink: %v", err)
150
		if err := os.Remove(restartSymlink(name)); err != nil {
15
151
		return err
151
			logger.Errorf("failed to remove restart symlink: %v", err)
16
152
			return err
17
153
		}
18
152
	}
154
	}
19
153
	if err := lxcContainer.Destroy(); err != nil {
155
	if err := lxcContainer.Destroy(); err != nil {
20
154
		logger.Errorf("failed to destroy lxc container: %v", err)
156
		logger.Errorf("failed to destroy lxc container: %v", err)
21
@@ -236,3 +238,18 @@
22
236
	}
238
	}
23
237
	return configFilename, nil
239
	return configFilename, nil
24
238
}
240
}
25
241
26
242
// useRestartDir is used to determine whether or not to use a symlink to the
27
243
// container config as the restart mechanism.  Older versions of LXC had the
28
244
// /etc/lxc/auto directory that would indicate that a container shoud auto-
29
245
// restart when the machine boots by having a symlink to the lxc.conf file.
30
246
// Newer versions don't do this, but instead have a config value inside the
31
247
// lxc.conf file.
32
248
func useRestartDir() bool {
33
249
	if _, err := os.Stat(LxcRestartDir); err != nil {
34
250
		if os.IsNotExist(err) {
35
251
			return false
36
252
		}
37
253
	}
38
254
	return true
39
255
}
40
239
256
41
=== modified file 'container/lxc/lxc_test.go'
42
--- container/lxc/lxc_test.go	2014-01-28 04:58:43 +0000
43
+++ container/lxc/lxc_test.go	2014-01-30 00:52:25 +0000
44
@@ -215,6 +215,16 @@
45
215
	c.Assert(autostartLink, jc.SymlinkDoesNotExist)
215
	c.Assert(autostartLink, jc.SymlinkDoesNotExist)
46
216
}
216
}
47
217
217
48
218
func (s *LxcSuite) TestStopContainerNoRestartDir(c *gc.C) {
49
219
	err := os.Remove(s.RestartDir)
50
220
	c.Assert(err, gc.IsNil)
51
221
52
222
	manager := lxc.NewContainerManager(container.ManagerConfig{})
53
223
	instance := containertesting.StartContainer(c, manager, "1/lxc/0")
54
224
	err = manager.StopContainer(instance)
55
225
	c.Assert(err, gc.IsNil)
56
226
}
57
227
58
218
type NetworkSuite struct {
228
type NetworkSuite struct {
59
219
	testbase.LoggingSuite
229
	testbase.LoggingSuite
60
220
}
230
}
61
221
231
62
=== removed file 'container/lxc/restart.go'
63
--- container/lxc/restart.go	2014-01-26 22:51:43 +0000
64
+++ container/lxc/restart.go	1970-01-01 00:00:00 +0000
65
@@ -1,16 +0,0 @@
66
1
package lxc
67
2
68
3
import (
69
4
	"os"
70
5
)
71
6
72
7
//If restart dir exists, return true. Otherwise, return false.
73
8
//TODO Should this test LXC version, not existence of restart dir?
74
9
func useRestartDir() bool {
75
10
	if _, err := os.Stat(LxcRestartDir); err != nil {
76
11
		if os.IsNotExist(err) {
77
12
			return false
78
13
		}
79
14
	}
80
15
	return true
81
16
}
Reviewer	Review Type	Date Requested	Status
Ian Booth		2014-01-30	Approve on 2014-01-30
Review via email: mp+203861@code.launchpad.net