Skip to content

Commit 2a292aa

Browse files
authored
Merge pull request #237 from Luap99/rosetta
remove rosetta disable work around
2 parents 874e7bb + ed1b6ad commit 2a292aa

2 files changed

Lines changed: 0 additions & 7 deletions

File tree

podman-image/rosetta-activation.service

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
[Unit]
22
Description=Activates Rosetta if necessary
33
After=systemd-binfmt.service
4-
# Rosetta is not functional on kernel 6.13 or newer so we like to have it not
5-
# running so the VM uses qemu-user instead. While we could remove the unit I
6-
# prefer to keep it with a marker file as apple could ship a new rosetta
7-
# version anytime and then testing it should be quite simple by creating this
8-
# file without us having to rebuild the VM image.
9-
ConditionPathExists=/etc/containers/enable-rosetta
104
ConditionVirtualization=apple
115
ConditionArchitecture=arm64
126

verify/image_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ var _ = Describe("run image tests", Ordered, ContinueOnFailure, func() {
111111
Expect(subscriptionManagerSession.outputToString()).To(Equal("loaded"))
112112
})
113113
It("should load Rosetta activation service", func() {
114-
Skip("rosetta disabled as it doesn't work on newer kernels")
115114
skipIfNotVmtype(AppleHvVirt, "Rosetta service is activated when the provider is applehv")
116115
rosettaCmd := []string{"machine", "ssh", machineName, "systemctl", "-P", "ActiveState", "show", "rosetta-activation.service"}
117116
rosettaSession, err := mb.setCmd(rosettaCmd).run()

0 commit comments

Comments
 (0)