undocker

commit dab7485e5ba8229aa50dc267bd26c4e9abf01971 (tree)
parent 64b5eaa954dd1f3e5244f09da9b0a166f4d8cbea
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Mon, 24 May 2021 00:11:58 +0300

lxc.execute.cmd was meant to be lxc.init.cmd

Diffstat:
M
lxcconfig/lxcconfig.go
 | 
2
+-
M
lxcconfig/lxcconfig_test.go
 | 
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxcconfig/lxcconfig.go b/lxcconfig/lxcconfig.go
@@ -20,7 +20,7 @@ var (
 		template.New("lxcconfig").Parse("" +
 			"lxc.include = LXC_TEMPLATE_CONFIG/common.conf\n" +
 			"lxc.architecture = {{ .Architecture }}\n" +
-			"lxc.execute.cmd = '{{ .Cmd }}'\n" +
+			"lxc.init.cmd = '{{ .Cmd }}'\n" +
 			"{{ if .Cwd }}lxc.init.cwd = {{ .Cwd }}\n{{ end }}" +
 			"{{ range .Env }}lxc.environment = {{ . }}\n{{ end }}"))
 	errBadManifest = errors.New("bad or missing manifest.json")
diff --git a/lxcconfig/lxcconfig_test.go b/lxcconfig/lxcconfig_test.go
@@ -27,7 +27,7 @@ func TestLXCConfig(t *testing.T) {
 			want: strings.Join([]string{
 				`lxc.include = LXC_TEMPLATE_CONFIG/common.conf`,
 				`lxc.architecture = amd64`,
-				`lxc.execute.cmd = '/bin/sh'`,
+				`lxc.init.cmd = '/bin/sh'`,
 				``,
 			}, "\n"),
 		},
@@ -48,7 +48,7 @@ func TestLXCConfig(t *testing.T) {
 			want: strings.Join([]string{
 				`lxc.include = LXC_TEMPLATE_CONFIG/common.conf`,
 				`lxc.architecture = amd64`,
-				`lxc.execute.cmd = '/entrypoint.sh /bin/sh -c "echo foo"'`,
+				`lxc.init.cmd = '/entrypoint.sh /bin/sh -c "echo foo"'`,
 				`lxc.init.cwd = /x`,
 				`lxc.environment = LONGNAME="Foo Bar"`,
 				`lxc.environment = SHELL=/bin/tcsh`,