ver4a/ostree-native-containers
1
0
Fork 0
Code Activity Actions

fix: Treat /usr/bin and /usr/sbin as same directory
All checks were successful
/ build-gnome (push) Successful in 17m44s
Details
/ build-kde (push) Successful in 25m17s
Details

Browse source 
These two directories have been merged in F42, given that the current
regex to exclude some packages from sbin is no longer valid and needs to
exclude both their bin and sbin paths.

https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin
This commit is contained in:
ver4a 2025-04-17 01:26:56 +02:00
parent e650817c5d
commit 667f41ed7c
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile.kde-nvidia-ver4a
View file

@ -24,7 +24,7 @@ RUN dnf5 -y autoremove
# Remove setuid/setgid binaries # Remove setuid/setgid binaries
# Except for polkit-agent-helper-1, it's currently required for interactive authentication with polkit. # Except for polkit-agent-helper-1, it's currently required for interactive authentication with polkit.
RUN find /usr -mindepth 1 -type f -perm /6000 -regextype posix-extended -not -regex '^/usr/lib/polkit-1/polkit-agent-helper-1$|^/usr/sbin/unix_chkpwd$|^/usr/bin/fusermount[0-9]?$' -exec sh -c "chmod ug-s '{}' && echo \"Removed setuid/setgid bit(s) from '{}'\"" \; RUN find /usr -mindepth 1 -type f -perm /6000 -regextype posix-extended -not -regex '^/usr/lib/polkit-1/polkit-agent-helper-1$|^/usr/s?bin/unix_chkpwd$|^/usr/s?bin/fusermount[0-9]?$' -exec sh -c "chmod ug-s '{}' && echo \"Removed setuid/setgid bit(s) from '{}'\"" \;
# https://github.com/ostreedev/ostree-rs-ext/issues/159 # https://github.com/ostreedev/ostree-rs-ext/issues/159
RUN ostree container commit RUN ostree container commit

2
Dockerfile.kde-ver4a
View file

@ -24,7 +24,7 @@ RUN dnf5 -y autoremove
# Remove setuid/setgid binaries # Remove setuid/setgid binaries
# Except for polkit-agent-helper-1, it's currently required for interactive authentication with polkit. # Except for polkit-agent-helper-1, it's currently required for interactive authentication with polkit.
RUN find /usr -mindepth 1 -type f -perm /6000 -regextype posix-extended -not -regex '^/usr/lib/polkit-1/polkit-agent-helper-1$|^/usr/sbin/unix_chkpwd$|^/usr/bin/fusermount[0-9]?$' -exec sh -c "chmod ug-s '{}' && echo \"Removed setuid/setgid bit(s) from '{}'\"" \; RUN find /usr -mindepth 1 -type f -perm /6000 -regextype posix-extended -not -regex '^/usr/lib/polkit-1/polkit-agent-helper-1$|^/usr/s?bin/unix_chkpwd$|^/usr/s?bin/fusermount[0-9]?$' -exec sh -c "chmod ug-s '{}' && echo \"Removed setuid/setgid bit(s) from '{}'\"" \;
# https://github.com/ostreedev/ostree-rs-ext/issues/159 # https://github.com/ostreedev/ostree-rs-ext/issues/159
RUN ostree container commit RUN ostree container commit