[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-569-g1b648fc

[GetAway <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  1b648fcacc68c6a569bb8cb17df924a9375e8f75 (commit)
      from  c931c9eb31c78842af8b13cfb615daed6635aaf7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1b648fcacc68c6a569bb8cb17df924a9375e8f75
Author: GetAway <get...@t-...>
Date:   Mon May 25 20:57:14 2015 +0200

    neutrino: fix load mac-address
    
    Signed-off-by: GetAway <get...@t-...>

diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index 451a06e..31a7707 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -459,7 +459,7 @@ int CNeutrinoApp::loadSetup()
 		g_settings.network_nfs[i].password       = configfile.getString("network_nfs_password_" + i_str, "");
 		g_settings.network_nfs[i].mount_options1 = configfile.getString("network_nfs_mount_options1_" + i_str, "ro,soft,udp" );
 		g_settings.network_nfs[i].mount_options2 = configfile.getString("network_nfs_mount_options2_" + i_str, "nolock,rsize=8192,wsize=8192" );
-		g_settings.network_nfs[i].mac            = configfile.getString("network_nfs_mac" + i_str, "11:22:33:44:55:66");
+		g_settings.network_nfs[i].mac            = configfile.getString("network_nfs_mac_" + i_str, "11:22:33:44:55:66");
 	}
 	g_settings.filesystem_is_utf8              = configfile.getBool("filesystem_is_utf8"                 , true );
 

-----------------------------------------------------------------------

Summary of changes:
 tuxbox/neutrino/src/neutrino.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


-- 
Tuxbox-GIT: apps