-
Notifications
You must be signed in to change notification settings - Fork 8
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
Unify (repeated) licenses clients #67
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From now on, they will be symlinks to the "firstboot_licenses" client wich is in charge to display found licenses according to sysconfig values for FIRSTBOOT_LICENSE_DIR and FIRSTBOOT_LICENSE_NOVELL_DIR
dgdavid
force-pushed
the
feature/improve-firstboot-xml
branch
4 times, most recently
from
May 10, 2019 18:31
7d45d66
to
187d27e
Compare
This will be the client used when the firstboot.xml's workflow contains whichever of below modules * firstboot_license * firstboot_licence_novell * firstboot_licenses (itself) Beyond the code reorganization, to work as is expected it does not take care of the default licenses directory anymore. This is already being done in the Yast::InstLicenseClient.
To use the (new) "firstboot_licenses" client for license agreement.
dgdavid
force-pushed
the
feature/improve-firstboot-xml
branch
from
May 10, 2019 18:46
187d27e
to
ea2fe5f
Compare
jreidinger
reviewed
May 13, 2019
jreidinger
reviewed
May 13, 2019
jreidinger
reviewed
May 13, 2019
jreidinger
reviewed
May 13, 2019
jreidinger
approved these changes
May 13, 2019
dgdavid
changed the title
Feature/improve firstboot xml
Unify (repeated) licenses clients
May 13, 2019
This was referenced May 13, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
There are three clients/modules practically identical.
Related to
Solution
Keep only one (firstboot_licenses.rb).
How?
Just converting the rest of them (firstboot_license.rb and firstboot_license_novell.rb) to symbolic links to ensure the backward compatibility.
Besides, to avoid showing the default license when only the selected one is desired, it is necessary to not take care about the default license directory since this is already being done in the
InstLicense
client.So, from now on, the firstboot.xml workflow only needs to include "firstboot_licenses" module
Although using "firstboot_license" or "firstboot_novell_license" will produce the same results.
Test
Screenshots
Let's see how the License agreement looks for each different scenarios. Click on each section to expand or collapse it.
Using the default values
That's,
FIRSTBOOT_LICENSE_DIR
andFIRSTBOOT_LICENSE_NOVELL_DIR
are empty (""
) or commented in /etc/sysconfig/firstboot.The license texts found in the default directory (global param) will be displayed.
Using a valid path for FIRSTBOOT_LICENSE_DIR
Using a valid path for FIRSTBOOT_LICENSE_NOVELL_DIR
Using a valid path for both, FIRSTBOOT_LICENSE_DIR and FIRSTBOOT_LICENSE_NOVELL_DIR
NOTE: if any license file could not be found, the client simply will be skipped.