Changeset 155b055


Ignore:
Timestamp:
09/23/13 08:28:04 (20 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, enter/10, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
7c7f02c, 108626c
Parents:
7ba4ea7 (diff), c3ae393 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
7 added
5 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/libpcbsd/utils/utils.cpp

    r1c4b1ae rc3ae393  
    278278        if ( val.isEmpty() ) 
    279279           return QString(); 
    280         return val.section(":", 3, 3); 
     280        return val.section(":", 3, 3).section("'", 1, 1); 
    281281} 
    282282 
  • src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp

    re4632f9 rc3ae393  
    10391039                authLine="digest:*:"; 
    10401040          authLine += lineProxyUser->text() + ":"; 
    1041           authLine += lineProxyPass->text() + ""; 
     1041          authLine += "'" + lineProxyPass->text() + "'"; 
    10421042          pcbsd::Utils::setProxyAuth(authLine); 
    10431043        } 
  • src-sh/pc-thinclient/pc-thinclient

    rb5e5e3e r4023a66  
    253253} 
    254254 
     255# Check if the user wants to install packages for the webui 
     256check_webui() { 
     257        echo "PC-ThinClient includes a web-interface for client management." 
     258        echo "Would you like to install the Apache / PHP packages required?" 
     259        echo -e "(Y/y)\c"; 
     260        read ans 
     261        if [ $ans != "y" -o "$ans" != "Y" ] ; then return; fi  
     262 
     263        pkg install apache22 php5-hash php5-session 
     264        if [ $? -ne 0 ] ; then 
     265                echo "Package install failed!" 
     266                echo "You may need to manually add apache, php5-hash and php5-session." 
     267        fi 
     268 
     269        # Make sure the config file exists 
     270        if [ ! -e "${PROGDIR}/resources/webui/config.php" ] ; then 
     271                cp ${PROGDIR}/resources/webui/config.php.dist ${PROGDIR}/resources/webui/config.php 
     272        fi 
     273 
     274        echo "All the webui files are located in: ${PROGDIR}/resources/webui" 
     275        echo "You will need to configure your web-server to serve this directory." 
     276        echo "" 
     277        echo "Please edit the file ${PROGDIR}/resources/webui/config.php to set the" 
     278        echo "user passwords / auth tokens for the site." 
     279} 
    255280 
    256281# Check if we need to install custom config 
     
    412437        mkdir ${PXEWORLD}/installscripts 
    413438        cp ${PROGDIR}/resources/scripts/pc-sysinstall.example ${PXEWORLD}/installscripts/pc-sysinstall.example 
     439        chown -R www:www ${PXEWORLD}/installscripts 
     440 
    414441        echo "zfs_load=\"YES\"" > ${PXEWORLD}/boot/loader.conf 
    415442        echo "geom_mirror_load=\"YES\"" >> ${PXEWORLD}/boot/loader.conf 
     
    480507  # Setup the installation directories 
    481508  check_installdirs 
     509 
     510  # Ask if they want to use the WebUI 
     511  check_webui 
    482512fi 
    483513 
  • src-sh/port-files/pkg-plist

    rad50d77 r4023a66  
    537537share/pcbsd/pc-thinclient/resources/dhcpd/dhcpd.conf 
    538538share/pcbsd/pc-thinclient/resources/boot/beastie.4th 
     539share/pcbsd/pc-thinclient/resources/webui/functions.php 
     540share/pcbsd/pc-thinclient/resources/webui/scripts.php 
     541share/pcbsd/pc-thinclient/resources/webui/clients.php 
     542share/pcbsd/pc-thinclient/resources/webui/config.php.dist 
     543share/pcbsd/pc-thinclient/resources/webui/logincheck.php 
     544share/pcbsd/pc-thinclient/resources/webui/index.php 
     545share/pcbsd/pc-thinclient/resources/webui/login.php 
    539546share/pcbsd/de-profiles/lxde.profile 
    540547share/pcbsd/de-profiles/kde.profile 
     
    734741@dirrm share/pcbsd/pc-thinclient/resources/scripts 
    735742@dirrm share/pcbsd/pc-thinclient/resources/gdm 
     743@dirrm share/pcbsd/pc-thinclient/resources/webui 
    736744@dirrm share/pcbsd/pc-thinclient/resources 
    737745@dirrm share/pcbsd/pc-thinclient 
  • src-qt4/about-gui/mainwindow.cpp

    r97d7433 r7ba4ea7  
    109109 
    110110    // memory 
    111     ui->MemoryLabel->setText(pcbsd::Utils::bytesToHumanReadable(pcbsd::Utils::sysctlAsInt("hw.realmem"))); 
     111    ui->MemoryLabel->setText(pcbsd::Utils::bytesToHumanReadable(pcbsd::Utils::sysctlAsInt("hw.physmem"))); 
    112112    //this->setFixedSize(this->geometry().width(),this->geometry().height()); 
    113113} 
Note: See TracChangeset for help on using the changeset viewer.