Ignore:
Timestamp:
04/12/13 08:40:12 (17 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
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/warden-gui/dialogwarden.cpp

    r1f0939e r0cfe72f  
    113113void dialogWarden::slotCheckNic()  
    114114{ 
    115    QString NIC = Utils::getValFromPCConf("/usr/local/etc/warden.conf", "NIC"); 
     115   QString NIC = pcbsd::Utils::getValFromPCConf("/usr/local/etc/warden.conf", "NIC"); 
    116116   if ( system("ifconfig " + NIC.toLatin1() + " >/dev/null 2>/dev/null") != 0 ) 
    117117   { 
     
    248248     
    249249    ProgDir = "/usr/local/share/warden"; 
    250     TMPDIR = Utils::getValFromPCConf("/usr/local/etc/warden.conf", "WTMP"); 
    251     JailDir = Utils::getValFromPCConf("/usr/local/etc/warden.conf", "JDIR"); 
     250    TMPDIR = pcbsd::Utils::getValFromPCConf("/usr/local/etc/warden.conf", "WTMP"); 
     251    JailDir = pcbsd::Utils::getValFromPCConf("/usr/local/etc/warden.conf", "JDIR"); 
    252252     
    253253} 
     
    14291429     return; 
    14301430 
    1431    Utils::runInTerminal(QString("warden chroot ") + listJails->currentItem()->text(0), 
     1431   pcbsd::Utils::runInTerminal(QString("warden chroot ") + listJails->currentItem()->text(0), 
    14321432                        QString("Jail: ") + listJails->currentItem()->text(0)); 
    14331433} 
     
    14821482 
    14831483   // We can return if we just changed to what is already set 
    1484    QString dMeta = Utils::getValFromPCConf(JailDir + listJails->currentItem()->text(0) + "/usr/local/etc/warden.conf", "PCBSD_METAPKGSET"); 
     1484   QString dMeta = pcbsd::Utils::getValFromPCConf(JailDir + listJails->currentItem()->text(0) + "/usr/local/etc/warden.conf", "PCBSD_METAPKGSET"); 
    14851485   if ( dMeta == comboPackageSet->currentText() ) 
    14861486      return; 
    14871487 
    14881488   // Update now 
    1489    Utils::setValPCConf(JailDir + listJails->currentItem()->text(0) + "/usr/local/etc/warden.conf", "PCBSD_METAPKGSET", comboPackageSet->currentText()); 
     1489   pcbsd::Utils::setValPCConf(JailDir + listJails->currentItem()->text(0) + "/usr/local/etc/warden.conf", "PCBSD_METAPKGSET", comboPackageSet->currentText()); 
    14901490 
    14911491   // Update the meta-widget 
Note: See TracChangeset for help on using the changeset viewer.