[PC-BSD Commits] r7561 - in pcbsd: current/src-qt4/pc-netmanager/src/ethernetconfig current/src-qt4/pc-netmanager/src/wificonfig stable/pcbsd-netmanager/src/ethernetconfig stable/pcbsd-netmanager/src/wificonfig

svn at pcbsd.org svn at pcbsd.org
Wed Sep 15 06:11:09 PDT 2010


Author: kris
Date: 2010-09-15 06:11:09 -0700 (Wed, 15 Sep 2010)
New Revision: 7561

Modified:
   pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp
   pcbsd/stable/pcbsd-netmanager/src/ethernetconfig/ethernetconfig.cpp
   pcbsd/stable/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.cpp
Log:

Don't need to mark ethernet devices as "up" when using lagg0



Modified: pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.cpp	2010-09-15 13:02:05 UTC (rev 7560)
+++ pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.cpp	2010-09-15 13:11:09 UTC (rev 7561)
@@ -112,7 +112,7 @@
   QString tmp, devices, tmp2;
 
   // Enable the lagg0 interface
-  saveValue( "/etc/rc.conf", "ifconfig_" + dev, "ifconfig_" + dev + "=\"up\"", -1);
+  //saveValue( "/etc/rc.conf", "ifconfig_" + dev, "ifconfig_" + dev + "=\"up\"", -1);
   saveValue( "/etc/rc.conf", "cloned_interfaces", "cloned_interfaces=\"lagg0\"", -1);
 
   tmp = getValue( "/etc/rc.conf", "ifconfig_lagg0=", 1 );

Modified: pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp	2010-09-15 13:02:05 UTC (rev 7560)
+++ pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp	2010-09-15 13:11:09 UTC (rev 7561)
@@ -61,10 +61,11 @@
   // If we have a valid wired device, clone the MAC of it to the wireless device
   if ( ! wiredDev.isEmpty() )
   {
-    tmp = getValue( "/etc/rc.conf", "ifconfig_" + wiredDev + "=\"up\"", 1 );
-    if ( ! tmp.isEmpty() )  {
-      saveValue( "/etc/rc.conf", "ifconfig_" + wiredDev, "ifconfig_" + wiredDev + "=\"up\"", -1);
-    }
+    // Don't need to mark a wired device as "up" to get its MAC
+    //tmp = getValue( "/etc/rc.conf", "ifconfig_" + wiredDev + "=\"up\"", 1 );
+    //if ( ! tmp.isEmpty() )  {
+    //  saveValue( "/etc/rc.conf", "ifconfig_" + wiredDev, "ifconfig_" + wiredDev + "=\"up\"", -1);
+    //}
 
     // If we are using wlan device
     if ( ! DeviceNameParent.isEmpty() ) {

Modified: pcbsd/stable/pcbsd-netmanager/src/ethernetconfig/ethernetconfig.cpp
===================================================================
--- pcbsd/stable/pcbsd-netmanager/src/ethernetconfig/ethernetconfig.cpp	2010-09-15 13:02:05 UTC (rev 7560)
+++ pcbsd/stable/pcbsd-netmanager/src/ethernetconfig/ethernetconfig.cpp	2010-09-15 13:11:09 UTC (rev 7561)
@@ -112,7 +112,7 @@
   QString tmp, devices, tmp2;
 
   // Enable the lagg0 interface
-  saveValue( "/etc/rc.conf", "ifconfig_" + dev, "ifconfig_" + dev + "=\"up\"", -1);
+  //saveValue( "/etc/rc.conf", "ifconfig_" + dev, "ifconfig_" + dev + "=\"up\"", -1);
   saveValue( "/etc/rc.conf", "cloned_interfaces", "cloned_interfaces=\"lagg0\"", -1);
 
   tmp = getValue( "/etc/rc.conf", "ifconfig_lagg0=", 1 );

Modified: pcbsd/stable/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.cpp
===================================================================
--- pcbsd/stable/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.cpp	2010-09-15 13:02:05 UTC (rev 7560)
+++ pcbsd/stable/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.cpp	2010-09-15 13:11:09 UTC (rev 7561)
@@ -61,10 +61,11 @@
   // If we have a valid wired device, clone the MAC of it to the wireless device
   if ( ! wiredDev.isEmpty() )
   {
-    tmp = getValue( "/etc/rc.conf", "ifconfig_" + wiredDev + "=\"up\"", 1 );
-    if ( ! tmp.isEmpty() )  {
-      saveValue( "/etc/rc.conf", "ifconfig_" + wiredDev, "ifconfig_" + wiredDev + "=\"up\"", -1);
-    }
+    // Don't need to mark wired device as "up"
+    //tmp = getValue( "/etc/rc.conf", "ifconfig_" + wiredDev + "=\"up\"", 1 );
+    //if ( ! tmp.isEmpty() )  {
+    //  saveValue( "/etc/rc.conf", "ifconfig_" + wiredDev, "ifconfig_" + wiredDev + "=\"up\"", -1);
+    //}
 
     // If we are using wlan device
     if ( ! DeviceNameParent.isEmpty() ) {



More information about the Commits mailing list