Merge pull request #20135 from ashley-cui/hypervroot

hyperV: Respect rootful option on machine init
containers · Sep 26, 2023 · f642349 · f642349
2 parents a5c7b0e + 65ce034
commit f642349
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/pkg/machine/e2e/init_test.go b/pkg/machine/e2e/init_test.go
@@ -174,10 +174,6 @@ var _ = Describe("podman machine init", 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{}
 		name := randomString()
 		session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath)).run()

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