[PC-BSD Commits] r7527 - in pcbsd: current/src-qt4/pc-sysinstaller stable/SysInstaller

[svn at pcbsd.org]

Author: kris
Date: 2010-09-08 07:05:17 -0700 (Wed, 08 Sep 2010)
New Revision: 7527

Modified:
   pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
   pcbsd/stable/SysInstaller/sysinstaller.cpp
Log:

Fixed bug when writing netDev= value in pc-sysinstall configure script, only need the device
name, not the <> data



Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-09-08 11:46:05 UTC (rev 7526)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-09-08 14:05:17 UTC (rev 7527)
@@ -616,7 +616,10 @@
     } 
     tmpList << "";
     tmpList << "# Network Settings";
-    tmpList << "netDev=" + comboSelectNic->currentText();
+    tmp = comboSelectNic->currentText();
+    if ( tmp.indexOf(":") > 0 )
+      tmp.truncate(tmp.indexOf(":"));
+    tmpList << "netDev=" + tmp;
     if ( comboSelectNic->currentText() != tr("AUTO-DHCP") )
     {
       tmpList << "netIP=" + lineIP->text();

Modified: pcbsd/stable/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/stable/SysInstaller/sysinstaller.cpp	2010-09-08 11:46:05 UTC (rev 7526)
+++ pcbsd/stable/SysInstaller/sysinstaller.cpp	2010-09-08 14:05:17 UTC (rev 7527)
@@ -579,7 +579,10 @@
     } 
     tmpList << "";
     tmpList << "# Network Settings";
-    tmpList << "netDev=" + comboSelectNic->currentText();
+    tmp = comboSelectNic->currentText();
+    if ( tmp.indexOf(":") > 0 )
+      tmp.truncate(tmp.indexOf(":"));
+    tmpList << "netDev=" + tmp;
     if ( comboSelectNic->currentText() != tr("AUTO-DHCP") )
     {
       tmpList << "netIP=" + lineIP->text();