Sets DHCLIENT_SET_HOSTNAME based on linuxrc or from the control file (bsc#1054933) #564
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
teclator
changed the title
teclator
changed the title
teclator
force-pushed
the
dhcp_hostname
branch
from
fc2df1b
to
3d58a33
Compare
imobachgs
requested changes
Sep 27, 2017
package/yast2-network.changes
Outdated
| @@ -1,4 +1,14 @@ | |||
| ------------------------------------------------------------------- | |||
| Tue Sep 26 12:44:47 UTC 2017 - knut.anderssen@suse.com | |||
|
|
|||
| - Preloads the global DHCLIENT_SET_HOSTNAME option based on linuxrc | |||
There was a problem hiding this comment.
"Preload" (same verbe tense than "Do not override").
| @@ -5,8 +5,15 @@ class SetupDhcp | |||
| include Singleton | |||
| include Logger | |||
|
|
|||
| def initialize | |||
| Yast.import "Linuxrc" | |||
There was a problem hiding this comment.
I usually move Yast.import to the same place than require calls.
| @@ -17,5 +24,39 @@ def main | |||
| # warning: possibly useless use of a literal in void context | |||
| :next | |||
| end | |||
|
|
|||
| # Check if set of DHCLIENT_SET_HOSTNAME in /etc/sysconfig/network/dhcp has | |||
| # been disable by linuxrc cmdline | |||
test/inst_setup_dhcp_test.rb
Outdated
| before do | ||
| allow(Yast::NetworkInterfaces).to receive(:adapt_old_config!) | ||
| end | ||
| let(:subject) { Yast::SetupDhcp.instance } |
There was a problem hiding this comment.
Please, use subject instead of let(:subject)
test/inst_setup_dhcp_test.rb
Outdated
| end | ||
|
|
||
| describe "set_dhcp_hostname?" do | ||
| let(:set_hostname) { "1" } |
There was a problem hiding this comment.
NP: you could move this to context where it applies, to make it clearer.
imobachgs
approved these changes
Sep 27, 2017
Merged
Merged
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.
Basically, it sets the DHCLIENT_SET_HOSTNAME in /etc/sysconfig/network/dhcp based on linuxrc cmdline sethostname option if provided or obtains the default from the control file if not.
https://github.com/yast/skelcd-control-SLES/blob/master/control/control.SLES.xml#L21
Screenshot after inst_setup_dhcp client (just after wellcome screen)
Screenshot after manual installation without special linuxrc cmdline options
CaaSP 2.0 Manual Network config
Notes and tricks
The libvirt network config used for the host:
The tests have been done with a modified CaaSP iso with last linuxrc modification and also modified with a DUD containing this code.
Replace widget instead of just the Items to show the complete interface name