Ignore:
Timestamp:
04/12/13 08:40:12 (20 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
bb72d33
Parents:
afd00d6
Message:

Add all the changes for related using of split pcbsd-utils libs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.cpp

    r1f0939e r0cfe72f  
    7878    if ( checkDisableNetwork->isChecked() ) 
    7979    { 
    80       Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", "", -1); 
     80      pcbsd::Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", "", -1); 
    8181      runCommand("ifconfig " + DeviceName + " down"); 
    8282      buttonApply->setEnabled(FALSE); 
     
    9393        } 
    9494         
    95         if ( ! Utils::validateIPV4(lineIP->text() ) ) { 
     95        if ( ! pcbsd::Utils::validateIPV4(lineIP->text() ) ) { 
    9696            QMessageBox::warning( this, tr("Warning"), 
    9797            tr("IP Address is out of range! (") + lineIP->text() + tr(") Fields must be between 0-255.") ); 
     
    9999               } 
    100100         
    101         if ( ! Utils::validateIPV4(lineNetmask->text() ) ) { 
     101        if ( ! pcbsd::Utils::validateIPV4(lineNetmask->text() ) ) { 
    102102            QMessageBox::warning( this, tr("Warning"), 
    103103            tr("Netmask is out of range! (") + lineNetmask->text() + tr(") Fields must be between 0-255.") ); 
     
    126126       // Get rid of the ifconfig line for the ipv6 interface 
    127127       // Remove old deprecated syntax as well: 
    128        Utils::setConfFileValue( "/etc/rc.conf", "ipv6_ifconfig_" + DeviceName + "=", "", -1); 
    129        Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "_ipv6=", "", -1); 
     128       pcbsd::Utils::setConfFileValue( "/etc/rc.conf", "ipv6_ifconfig_" + DeviceName + "=", "", -1); 
     129       pcbsd::Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "_ipv6=", "", -1); 
    130130       // Set accept_rtadv 
    131        Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "_ipv6=", "ifconfig_" + DeviceName + "_ipv6=\"inet6 accept_rtadv\"", -1); 
     131       pcbsd::Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "_ipv6=", "ifconfig_" + DeviceName + "_ipv6=\"inet6 accept_rtadv\"", -1); 
    132132    } else { 
    133133       // Set static address and disbale accept_rtadv.  This means someone will also have to set 
     
    139139             tmp.prepend("inet6 "); 
    140140          } 
    141           Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "_ipv6=", "ifconfig_" + DeviceName + "_ipv6=\"" + tmp + " -accept_rtadv\"", -1); 
     141          pcbsd::Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "_ipv6=", "ifconfig_" + DeviceName + "_ipv6=\"" + tmp + " -accept_rtadv\"", -1); 
    142142       } 
    143143    } 
    144144 
    145    Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", "ifconfig_" + DeviceName + "=\"" + ifConfigLine + "\"", -1);  
     145   pcbsd::Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", "ifconfig_" + DeviceName + "=\"" + ifConfigLine + "\"", -1);  
    146146 
    147147   // See if we need to enable lagg on this device 
     
    149149      NetworkInterface::enableLagg(QString("wlan0")); 
    150150     
    151    Utils::restartNetworking(); 
     151   pcbsd::Utils::restartNetworking(); 
    152152 
    153153   // Done, now set the apply button to off 
     
    374374   // Start loading the device information 
    375375   if ( useLagg ) 
    376       tmp = Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_lagg0=", 1 ); 
     376      tmp = pcbsd::Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_lagg0=", 1 ); 
    377377 
    378378   if ( tmp.isEmpty() ) 
    379       tmp = Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", 1 ); 
     379      tmp = pcbsd::Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", 1 ); 
    380380 
    381381   // Using WPAE config? 
     
    457457  // Check for the IPv6 Configuration 
    458458  // Start loading the device information 
    459    tmp = Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "_ipv6=", 1 ); 
     459   tmp = pcbsd::Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "_ipv6=", 1 ); 
    460460   if ( tmp.isEmpty() ) { 
    461461        // Check for backward compat. 
    462         tmp = Utils::getConfFileValue( "/etc/rc.conf", "ipv6_ifconfig_" + DeviceName + "=", 1 ); 
     462        tmp = pcbsd::Utils::getConfFileValue( "/etc/rc.conf", "ipv6_ifconfig_" + DeviceName + "=", 1 ); 
    463463   } 
    464464   if ( ! tmp.isEmpty() ) { 
Note: See TracChangeset for help on using the changeset viewer.