diff --git a/contrib/cirrus/mac_env.sh b/contrib/cirrus/mac_env.sh index ce9eed793c..367e6d1c50 100755 --- a/contrib/cirrus/mac_env.sh +++ b/contrib/cirrus/mac_env.sh @@ -24,3 +24,6 @@ go env # The latest version is installed system-wide when instances are created. Make the # current version known. vfkit --version + +# Make the current version of krunkit known. +krunkit --version diff --git a/pkg/machine/apple/apple.go b/pkg/machine/apple/apple.go index 940c576e39..092854127f 100644 --- a/pkg/machine/apple/apple.go +++ b/pkg/machine/apple/apple.go @@ -180,7 +180,7 @@ func StartGenericAppleVM(mc *vmconfigs.MachineConfig, cmdBinary string, bootload } vm.Devices = append(vm.Devices, mounts...) - timesync, err := vfConfig.TimeSyncNew(1234) + timesync, err := vfConfig.TimeSyncNew(define.TimeSyncVsockPort) if err != nil { return nil, nil, err } diff --git a/pkg/machine/define/config.go b/pkg/machine/define/config.go index 32d401d862..428bfdd645 100644 --- a/pkg/machine/define/config.go +++ b/pkg/machine/define/config.go @@ -6,6 +6,9 @@ const ( UserCertsTargetPath = "/etc/containers/certs.d" DefaultIdentityName = "machine" DefaultMachineName = "podman-machine-default" + // TimeSyncVsockPort is the vsock port for host->guest time sync via qemu-guest-agent. + // Podman passes this to vfkit/krunkit --timesync; podman-machine-os configures qemu-guest-agent on the same port. + TimeSyncVsockPort = 1234 ) // MountTag is an identifier to mount a VirtioFS file system tag on a mount point in the VM.