summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-04-26 17:28:12 -0400
committerGitHub <noreply@github.com>2021-04-26 17:28:12 -0400
commit258a490fe48f9f3356c38e5d616fdc3512e49f13 (patch)
tree59f335a1ef761fec38ab7a7bc0616843cf4788f1 /pkg
parent476c76f580d5cd092ff958765af36857b2a68d6c (diff)
parentbd76701e893e8e1797c11eac2531f300048e0cca (diff)
downloadpodman-258a490fe48f9f3356c38e5d616fdc3512e49f13.tar.gz
podman-258a490fe48f9f3356c38e5d616fdc3512e49f13.tar.bz2
podman-258a490fe48f9f3356c38e5d616fdc3512e49f13.zip
Merge pull request #10125 from ashley-cui/machenabled
[NO TESTS NEEDED] Add machine-enabled to containers.conf for machine
Diffstat (limited to 'pkg')
-rw-r--r--pkg/machine/ignition.go16
1 files changed, 16 insertions, 0 deletions
diff --git a/pkg/machine/ignition.go b/pkg/machine/ignition.go
index cc5c01de6..00068a136 100644
--- a/pkg/machine/ignition.go
+++ b/pkg/machine/ignition.go
@@ -168,6 +168,22 @@ func getFiles(usrName string) []File {
},
FileEmbedded1: FileEmbedded1{Mode: intToPtr(420)},
})
+
+ // Set machine_enabled to true to indicate we're in a VM
+ files = append(files, File{
+ Node: Node{
+ Group: getNodeGrp("root"),
+ Path: "/etc/containers/containers.conf",
+ User: getNodeUsr("root"),
+ },
+ FileEmbedded1: FileEmbedded1{
+ Append: nil,
+ Contents: Resource{
+ Source: strToPtr("data:,%5Bengine%5D%0Amachine_enabled%3Dtrue%0A"),
+ },
+ Mode: intToPtr(420),
+ },
+ })
return files
}