Merge pull request #94 from mchf/Code-11-SP2

No objections and already in SP3. Merging.
yast · May 30, 2013 · 5ed33ec · 5ed33ec
2 parents 0075840 + 2ebbd49
commit 5ed33ec
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed May 29 10:19:10 UTC 2013 - mfilka@suse.com
+
+- bnc#821427
+    - fixed biosdevname renaming in case of buggy SMBIOS.
+    - original patch provided by Martin Wilck 
+    (martin.wilck@ts.fujitsu.com)
+- bnc#810525
+	- fixed typo in dialog 
+
 -------------------------------------------------------------------
 Mon May 27 06:21:40 UTC 2013 - mfilka@suse.com
 

diff --git a/src/clients/save_network.ycp b/src/clients/save_network.ycp
@@ -317,7 +317,8 @@ void CreateIfcfg() {
 
     string new_netdevice = netdevice;
     if (! LanUdevAuto::AllowUdevModify()) {
-        string cmd = sformat("biosdevname --policy=all_names -i %1", netdevice);
+        // bnc#821427: use same options as in /lib/udev/rules.d/71-biosdevname.rules
+        string cmd = sformat("biosdevname --policy physical --smbios 2.6 --nopirq -i %1", netdevice);
         string out = String::FirstChunk(StdoutOf(cmd), "\n");
         if (out != "") {
             y2milestone ("biosdevname renames %1 to %2", netdevice, out);

diff --git a/src/lan/bridge.ycp b/src/lan/bridge.ycp
@@ -80,7 +80,7 @@ boolean ValidateBridge (string key, map event) {
       if ((string)configurations[NetworkInterfaces::GetType(device), device, "IPADDR"]:"" != "0.0.0.0" && (string)configurations[NetworkInterfaces::GetType(device), device, "BOOTPROTO"]:"" != "none") {
 	if(!confirmed) {
 	 valid = Popup::ContinueCancel(_("At least one selected device is already configured.
-Adapt the configuration for bridge (IP addess 0.0.0.0/32)?
+Adapt the configuration for bridge (IP address 0.0.0.0/32)?
 "));
 	 confirmed=true;
 	}