opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 09:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20135 from ashley-cui/hypervroot

Browse Source 
hyperV: Respect rootful option on machine init
This commit is contained in:
OpenShift Merge Robot
2023-09-26 10:54:46 -04:00
committed by GitHub
parent a5c7b0ea57 65ce034863
commit f64234969a
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/machine/e2e/init_test.go
View File

@ -174,10 +174,6 @@ var _ = Describe("podman machine init", func() {
}) })
It("machine init rootless docker.sock check", func() { It("machine init rootless docker.sock check", func() {
if testProvider.VMType() == machine.HyperVVirt {
//https://github.com/containers/podman/issues/20092
Skip("rootless is broken with hyperv")
}
i := initMachine{} i := initMachine{}
name := randomString() name := randomString()
session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath)).run() session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath)).run()

2
pkg/machine/hyperv/machine.go
View File

@ -95,6 +95,7 @@ func (m *HyperVMachine) writeIgnitionConfigFile(opts machine.InitOptions, user,
TimeZone: opts.TimeZone, TimeZone: opts.TimeZone,
WritePath: m.IgnitionFile.GetPath(), WritePath: m.IgnitionFile.GetPath(),
UID: m.UID, UID: m.UID,
Rootful: m.Rootful,
} }
if err := ign.GenerateIgnitionConfig(); err != nil { if err := ign.GenerateIgnitionConfig(); err != nil {
@ -243,6 +244,7 @@ func (m *HyperVMachine) Init(opts machine.InitOptions) (bool, error) {
DiskSize: opts.DiskSize, DiskSize: opts.DiskSize,
Memory: opts.Memory, Memory: opts.Memory,
} }
m.Rootful = opts.Rootful
// If the user provides an ignition file, we need to // If the user provides an ignition file, we need to
// copy it into the conf dir // copy it into the conf dir