Skip to content

app, tests: Use the same PATH as on package based Fedora variants #5507

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.

Sign up for GitHub

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

Open
debarshiray wants to merge 1 commit into
base: main
Choose a base branch
from
Open

app, tests: Use the same PATH as on package based Fedora variants #5507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/rpm-ostree-0-integration.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ d /usr/local/etc 0755 root root -
d /usr/local/games 0755 root root -
d /usr/local/include 0755 root root -
d /usr/local/lib 0755 root root -
d /usr/local/sbin 0755 root root -
L /usr/local/sbin - - - - bin
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot Oct 10, 2025

Choose a reason for hiding this comment

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

medium

For improved maintainability, it would be beneficial to add a comment explaining why /usr/local/sbin is being created as a symbolic link, especially since other entries in this file create directories. This captures the valuable context from your pull request description directly in the configuration file for future reference.

# Unify /usr/local/sbin with /usr/local/bin for a consistent PATH,
# matching package-based Fedora variants.
L /usr/local/sbin - - - - bin

d /usr/local/share 0755 root root -
d /usr/local/src 0755 root root -
1 change: 1 addition & 0 deletions tests/compose/libbasic-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ echo "ok --parent"
# Check symlinks injected into the rootfs.
ostree --repo="${repo}" ls "${treeref}" /usr/local | grep '^l00777' > symlinks.txt
assert_file_has_content_literal symlinks.txt '/usr/local -> ../var/usrlocal'
assert_file_has_content_literal symlinks.txt '/usr/local/sbin -> bin'
Copy link
Copy Markdown
Author

@debarshiray debarshiray Oct 12, 2025

Choose a reason for hiding this comment

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

After playing with ostree ls on Fedora Silverblue, it seems that OSTree doesn't know about what's going on inside /var/usrlocal. So, maybe I should leave this out? Is there some other way to test it? Does it need a test?

ostree --repo="${repo}" ls "${treeref}" /opt > symlinks.txt
assert_file_has_content_literal symlinks.txt '/opt -> var/opt'
echo "ok symlinks"
Expand Down
Loading