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

Load the product configuration files #117

Merged

Conversation

poncovka
Copy link
Contributor

Load the product configuration files to have the right defaults. Use
the product name from the os-release files of the system environment.
Simplify the product-related code.

import glob

RELEASE_STRING_FILE = "/etc/os-release"
LICENSE_FILE_GLOB = "/usr/share/redhat-release*/EULA*"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I could find only /usr/share/redhat-release/EULA on the installed system.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yep, as far as I can tell this is the only file used these days, so should be correct. :)

@poncovka poncovka force-pushed the master-load_product_configurations branch 2 times, most recently from 20caaef to c802337 Compare February 16, 2021 19:03
@poncovka poncovka marked this pull request as ready for review February 16, 2021 19:24
@poncovka
Copy link
Contributor Author

Tested with kickstart tests and a fake EULA.

Copy link
Member

@jkonecny12 jkonecny12 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 AFAICT.

Load the product configuration files to have the right defaults. Use
the product name from the os-release files of the system environment.
Simplify the product-related code.
@poncovka poncovka force-pushed the master-load_product_configurations branch from c802337 to b1ed608 Compare February 22, 2021 09:46
@poncovka
Copy link
Contributor Author

Rebased.

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, thanks a lot - a really nice cleanup as well! :)

import glob

RELEASE_STRING_FILE = "/etc/os-release"
LICENSE_FILE_GLOB = "/usr/share/redhat-release*/EULA*"
Copy link
Contributor

Choose a reason for hiding this comment

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

Yep, as far as I can tell this is the only file used these days, so should be correct. :)

@M4rtinK M4rtinK merged commit 2983c4e into rhinstaller:master Feb 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants