Skip to content

Commit c6211c0

Browse files
committed
Update podman code
This picks up a few fixes related to files left over after `macadam rm` Signed-off-by: Christophe Fergeau <[email protected]>
1 parent 71a6cb5 commit c6211c0

File tree

8 files changed

+63
-15
lines changed

8 files changed

+63
-15
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,6 @@ require (
191191
tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect
192192
)
193193

194-
replace github.com/containers/podman/v5 => github.com/cfergeau/podman/v5 v5.0.0-20250827094930-c4e064e63225
194+
replace github.com/containers/podman/v5 => github.com/cfergeau/podman/v5 v5.0.0-20250902115822-6beaa3dcfd74
195195

196196
replace github.com/crc-org/machine => github.com/cfergeau/machine v0.0.0-20241127155529-1b8b9b8d1078

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
3333
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
3434
github.com/cfergeau/machine v0.0.0-20241127155529-1b8b9b8d1078 h1:KpgRncgq6ZiWDnLe6R58dJjd6QSuU7RDqRrpl11Dxcg=
3535
github.com/cfergeau/machine v0.0.0-20241127155529-1b8b9b8d1078/go.mod h1:trWeQimjfE3dJ8qWOxI4ePtYm13aecK42bf01s6h/Nc=
36-
github.com/cfergeau/podman/v5 v5.0.0-20250827094930-c4e064e63225 h1:6mU03Tns0Xxi+E0pp8E7VC3QaaDLNloZWF+URuALRg0=
37-
github.com/cfergeau/podman/v5 v5.0.0-20250827094930-c4e064e63225/go.mod h1:AkMebnGmyIu6vXJnzObFM7huGUfkdQhQ+vqRw7Qo9l4=
36+
github.com/cfergeau/podman/v5 v5.0.0-20250902115822-6beaa3dcfd74 h1:brp8mY/c1yEYKMsIkBWbB7tJi8c4ZVIVMeq6SPqcYeE=
37+
github.com/cfergeau/podman/v5 v5.0.0-20250902115822-6beaa3dcfd74/go.mod h1:AkMebnGmyIu6vXJnzObFM7huGUfkdQhQ+vqRw7Qo9l4=
3838
github.com/checkpoint-restore/checkpointctl v1.3.0 h1:bNz5b6s+lxFdG5ZGDba3qSkBtXDDTCG2494dfAbQJ4E=
3939
github.com/checkpoint-restore/checkpointctl v1.3.0/go.mod h1:dqZH4wDvbjnsqFGK2LdUDk21yFQ1dCAtzgRMlG44KDM=
4040
github.com/checkpoint-restore/go-criu/v7 v7.2.0 h1:qGiWA4App1gGlEfIJ68WR9jbezV9J7yZdjzglezcqKo=

vendor/github.com/containers/podman/v5/pkg/machine/apple/apple.go

Lines changed: 12 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/podman/v5/pkg/machine/cloudinit/cloudinit.go

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/podman/v5/pkg/machine/hyperv/stubber.go

Lines changed: 23 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/podman/v5/pkg/machine/qemu/machine.go

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/podman/v5/pkg/machine/qemu/stubber.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ github.com/containers/ocicrypt/keywrap/pkcs7
317317
github.com/containers/ocicrypt/spec
318318
github.com/containers/ocicrypt/utils
319319
github.com/containers/ocicrypt/utils/keyprovider
320-
# github.com/containers/podman/v5 v5.3.1 => github.com/cfergeau/podman/v5 v5.0.0-20250827094930-c4e064e63225
320+
# github.com/containers/podman/v5 v5.3.1 => github.com/cfergeau/podman/v5 v5.0.0-20250902115822-6beaa3dcfd74
321321
## explicit; go 1.23.3
322322
github.com/containers/podman/v5/cmd/podman/parse
323323
github.com/containers/podman/v5/cmd/podman/registry
@@ -1303,5 +1303,5 @@ tags.cncf.io/container-device-interface/pkg/parser
13031303
# tags.cncf.io/container-device-interface/specs-go v1.0.0
13041304
## explicit; go 1.19
13051305
tags.cncf.io/container-device-interface/specs-go
1306-
# github.com/containers/podman/v5 => github.com/cfergeau/podman/v5 v5.0.0-20250827094930-c4e064e63225
1306+
# github.com/containers/podman/v5 => github.com/cfergeau/podman/v5 v5.0.0-20250902115822-6beaa3dcfd74
13071307
# github.com/crc-org/machine => github.com/cfergeau/machine v0.0.0-20241127155529-1b8b9b8d1078

0 commit comments

Comments
 (0)