Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

overlay: store if there are no ACLs in the layer #1663

Merged
merged 2 commits into from Jul 7, 2023

Conversation

giuseppe
Copy link
Member

@giuseppe giuseppe commented Jul 5, 2023

if there are no ACLs, then we mount the EROFS layer with the "noacl" mount option.

Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com

drivers/overlay/composefs_supported.go Outdated Show resolved Hide resolved
drivers/overlay/composefs_supported.go Outdated Show resolved Hide resolved
@giuseppe giuseppe marked this pull request as draft July 6, 2023 09:55
@alexlarsson
Copy link
Contributor

None of this seems needed. We already store the LCFS_EROFS_FLAGS_HAS_ACL in the struct lcfs_erofs_header_s at offset 0 in the image.

@cgwalters
Copy link
Contributor

None of this seems needed. We already store the LCFS_EROFS_FLAGS_HAS_ACL in the struct lcfs_erofs_header_s at offset 0 in the image.

Right, I raised the same point in this thread #1663 (comment) but basically we're not using mount.composefs here.

@giuseppe giuseppe marked this pull request as ready for review July 6, 2023 10:28
@giuseppe
Copy link
Member Author

giuseppe commented Jul 6, 2023

fixed the patch to read the flag from the composefs file itself, it is much simpler now

@giuseppe giuseppe force-pushed the support-erofs-noacl branch 2 times, most recently from 858cd50 to 1657126 Compare July 6, 2023 12:57
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
if there are no ACLs, then we mount the EROFS layer with the "noacl"
mount option.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe
Copy link
Member Author

giuseppe commented Jul 6, 2023

@rhatdan fine to merge this as well?

@rhatdan
Copy link
Member

rhatdan commented Jul 7, 2023

LGTM

@rhatdan rhatdan merged commit 3a91ecd into containers:main Jul 7, 2023
18 checks passed
Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(A very late look I’m afraid)

erofsBlob := d.getErofsBlob(lowerID)
_, err = os.Stat(erofsBlob)
maybeAddComposefsMount := func(lowerID string, i int) (string, error) {
composefsBlob := d.getComposefsData(lowerID)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/composefsBlob/composefsDataDir/g?

if err != nil {
if os.IsNotExist(err) {
return "", nil
}
return "", err
}
logrus.Debugf("overlay: using erofs blob %s for lower %s", erofsBlob, lowerID)
logrus.Debugf("overlay: using composefs blob %s for lower %s", composefsBlob, lowerID)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

… and something like s/blob/subdirectory/ here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants