Skip to content

Commit

Permalink
always do network card detection in the first stage (bnc#915180)
Browse files Browse the repository at this point in the history
Always detect network cards when saving the network config before
reboot in the first stage to include the correct card name
in the ifcfg file.

- 2.17.207
  • Loading branch information
lslezak committed May 21, 2015
1 parent 2d466a3 commit d407e7b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
2.17.206
2.17.207
8 changes: 8 additions & 0 deletions package/yast2-network.changes
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu May 21 14:43:03 UTC 2015 - lslezak@suse.cz

- Always detect network cards when saving the network config before
reboot in the first stage to include the correct card name
in the ifcfg file (bnc#915180).
- 2.17.207

-------------------------------------------------------------------
Mon May 18 07:57:50 UTC 2015 - mfilka@suse.com

Expand Down
6 changes: 5 additions & 1 deletion src/routines/routines.ycp
Expand Up @@ -26,6 +26,7 @@ import "Mode";
import "IP";
import "Netmask";
import "TypeRepository";
import "Stage";

/**
* Abort function
Expand Down Expand Up @@ -640,7 +641,10 @@ define list<map> ReadHardware(string hwtype) {
/* Confirmation: label text (detecting hardware: xxx) */
string hwstring = _("All Network Devices");
if(haskey(hwstrings, hwtype)) hwstring = hwstrings[hwtype]:"";
if(!Confirm::Detection(hwstring, "yast-lan")) return [];

// don't ask in the 1st stage, if we need to save a netcard config then network was already
// used for installation and asking is useless
if(!Stage::initial() && !Confirm::Detection(hwstring, "yast-lan")) return [];

/* read the corresponding hardware */
if(haskey(hwtypes, hwtype))
Expand Down

0 comments on commit d407e7b

Please sign in to comment.