DO NOT MERGE: Vendor https://github.com/containers/storage/pull/1407

[mtrmac]

Signed-off-by: Miloslav Trmač [email protected]

Does this PR introduce a user-facing change?

Improves resiliency against interrupted image pulls.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mtrmac

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [mtrmac]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[mtrmac]

In system tests, seeing

ok 333 podman corrupt images - cleanup
[+1206s] not ok 334 podman container storage is not accessible by unprivileged users
         # (from function `die' in file test/system/[helpers.bash, line 594](https://github.com/containers/podman/blob/51df93b6fa50a329a365468e134c22aebaa87285/test/system/helpers.bash#L594),
         #  from function `run_podman' in file test/system/[helpers.bash, line 214](https://github.com/containers/podman/blob/51df93b6fa50a329a365468e134c22aebaa87285/test/system/helpers.bash#L214),
         #  in test file test/system/[400-unprivileged-access.bats, line 14](https://github.com/containers/podman/blob/51df93b6fa50a329a365468e134c22aebaa87285/test/system/400-unprivileged-access.bats#L14))
         #   `run_podman run --name c_uidmap   --uidmap 0:10000:10000 $IMAGE true' failed
         # # podman rm -t 0 --all --force --ignore
         # # podman ps --all --external --format {{.ID}} {{.Names}}
         # # podman images --all --format {{.Repository}}:{{.Tag}} {{.ID}}
         # quay.io/libpod/testimage:20221018 fb12c9a035c2
         # # podman run --name c_uidmap --uidmap 0:10000:10000 quay.io/libpod/testimage:20221018 true
         # Error: open /etc in the container: no such file or directory

and one more in not ok 372 podman run /etc/* permissions .

[edsantiago]

/me checks his world clock. Rubs eyes, checks again.

Are you fully rebased on main? This smells a little like #15698 and #15977, which I reluctantly workarounded in #15981.

[mtrmac]

@edsantiago Thanks, I found one of those. I do think this was built after #15981, and anyway I have just pushed a rebase on current main.

It’s very possible that this truly broken storage, a bug in my work.

[mtrmac]

The c/storage PR was merged.