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

Fix download of stage2 image from .treeinfo #5773

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

jkonecny12
Copy link
Member

@jkonecny12 jkonecny12 commented Jul 16, 2024

This is fix to enable downloading stage2 image from a non default place with .treeinfo file. If .treeinfo has a path to the stage2 image it will be used as the first variant, in case this will fail it will fallback to default paths.

This is fixing two parts:

  • Reading values from configuration file (.treeinfo and .buildstamp).
  • Fix issue that curl is not able to understand // in the path.

Missing:

  • Add test coverage

@jkonecny12
Copy link
Member Author

/kickstart-test --testtype smoke

@jkonecny12
Copy link
Member Author

/kickstart-test --testtype coverage

1 similar comment
@jkonecny12
Copy link
Member Author

/kickstart-test --testtype coverage

Copy link
Contributor

@M4rtinK M4rtinK left a comment

Choose a reason for hiding this comment

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

Looks good to me. :)

@@ -108,6 +112,10 @@ anaconda_net_root() {
local repo="$1"
info "anaconda: fetching stage2 from $repo"

# Remove last `/` from repo to enable cunstructs like ...os/../BaseOS/image/install.img
Copy link
Contributor

Choose a reason for hiding this comment

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

s/cunstructs/constructs/ ?

@jkonecny12 jkonecny12 added f42 Fedora 42 and removed f41 labels Aug 22, 2024
@KKoukiou KKoukiou marked this pull request as draft September 25, 2024 11:30
Copy link

This PR is stale because it has been open 60 days with no activity.
Remove stale label or comment or this will be closed in 30 days.

@github-actions github-actions bot added the stale label Nov 25, 2024
@github-actions github-actions bot removed the stale label Dec 21, 2024
With commit 0785531 the `get_config`
function in anaconda-lib.sh was broken because missing quotes removed
leading and trailing whitespace characters automatically but after the
fix in commit mentioned above this side effect was fixed which lead in
broken code. In other words the key were never matched because of
trailing whitespace.

Issue raised by this is not being able to read .treeinfo and .buildstamp
files in Dracut. Example of such situation is broken boot when stage2
image is stored under special path mentioned in .treeinfo file.

Related: RHEL-48821
@jkonecny12 jkonecny12 force-pushed the master-fix-updir-unified-iso branch from 89fd44c to 0a2664e Compare January 19, 2025 22:37
@pep8speaks
Copy link

pep8speaks commented Jan 19, 2025

Hello @jkonecny12! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2025-01-20 16:28:49 UTC

@jkonecny12 jkonecny12 marked this pull request as ready for review January 19, 2025 22:39
In Dracut the URL concatenation from .treeinfo could also point you to
directory above by `..`. However, if the `inst.repo=` argument was
set with trailing `/` it will create URL which is not supported by curl.

Supported:
`os/../BaseOS/`
Unsupported by curl:
`os//../BaseOS/`

Remove the trailing `/` to avoid this issue.

Resolves: RHEL-48821
@jkonecny12 jkonecny12 force-pushed the master-fix-updir-unified-iso branch from 0a2664e to 7a05f00 Compare January 19, 2025 22:40
This commit will also add code to enable testing of the Dracut shell
scripts.

Related: RHEL-48821
Dracut testing should be more versatile with this approach. This is more
an extension for future testing.
@jkonecny12 jkonecny12 force-pushed the master-fix-updir-unified-iso branch from 7a05f00 to 63b081c Compare January 20, 2025 16:28
@jkonecny12
Copy link
Member Author

/kickstart-test --testtype smoke

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
f42 Fedora 42
Development

Successfully merging this pull request may close these issues.

5 participants