Changeset b5fd988


Ignore:
Timestamp:
01/10/14 09:13:24 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
db2add1
Parents:
b611b6c (diff), c21cafa (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:
5 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-updatecenter/dialogs/updatehistorydialog.ui

    r08cf0aa rc21cafa  
    1212  </property> 
    1313  <property name="windowTitle"> 
    14    <string>Dialog</string> 
     14   <string>Base system updates history</string> 
    1515  </property> 
    1616  <layout class="QVBoxLayout" name="verticalLayout"> 
  • src-qt4/pc-updatecenter/syscontroller.cpp

    r08cf0aa rc21cafa  
    9494    QVector<CSysController::SFbsdUpdatesDescription> out; 
    9595 
    96     QStringList fetch_out = pcbsd::Utils::runShellCommand(QString(UPDATE_DESCRIPTIONS_FETCH_COMMAND) + " " + UPDATE_DESCRIPTIONS_URL); 
    97  
    9896    if (!mvFbsdUpdateDescriptions.size() || isForse) 
    9997    { 
     98        QStringList fetch_out = pcbsd::Utils::runShellCommand(QString(UPDATE_DESCRIPTIONS_FETCH_COMMAND) + " " + UPDATE_DESCRIPTIONS_URL); 
    10099        mvFbsdUpdateDescriptions.clear(); 
    101100        for (int i=0; i<fetch_out.size(); i++) 
     
    139138    mFilesToRemove.clear(); 
    140139    mFilesToUpdate.clear(); 
     140    mCurrentFbsdDescription = tr("Base system update"); 
     141    updateDescriptions(); 
    141142} 
    142143 
     
    237238        { 
    238239            SSystemUpdate entry; 
    239             entry.mName= tr("Base system update"); 
     240            entry.mName = mCurrentFbsdDescription; 
    240241            entry.mType= eFBSDUPDATE; 
    241242            entry.misRequiresReboot= misFBSDRebootRequired; 
     
    305306    { 
    306307        setCurrentState(eFULLY_UPDATED); 
    307     }*/ 
     308    }*/     
    308309    static SSystemUpdate upd; 
    309310    line= line.trimmed(); 
     
    369370void CSysController::parseCheckFREEBSDLine(QString line) 
    370371{ 
    371     //qDebug()<<line; 
    372  
    373372    typedef enum{ 
    374373        eUndefined, 
     
    393392    if (line.contains(FILES_MODIFYED_LOCALLY)) 
    394393    { 
    395         currCheckState= eFilesModifyedLocally; 
     394        currCheckState= eFilesModifyedLocally;         
    396395        return; 
    397396    } 
     
    399398    { 
    400399        currCheckState= eFilesToDelete; 
     400        mCurrentFbsdDescription= fbsdUpdateDescription(line); 
    401401        return; 
    402402    } 
    403403    else if (line.contains(FILES_TO_UPDATE)) 
    404     { 
     404    {         
    405405        currCheckState= eFilesToUpdate; 
     406        mCurrentFbsdDescription= fbsdUpdateDescription(line); 
     407 
    406408        return; 
    407409    } 
     
    526528    reportLogLine(line); 
    527529} 
     530 
     531/////////////////////////////////////////////////////////////////////////////// 
     532QString CSysController::fbsdUpdateDescription(QString line) 
     533{ 
     534    // Example line: "The following files will be updated as part of updating to 10.0-RELEASE-p3:" 
     535    line = line.trimmed(); 
     536    QString release = line.right(line.length() - line.lastIndexOf(" ")); 
     537    release = release.left(release.lastIndexOf("-")).trimmed(); 
     538    QString patch = line.right(line.length() - line.lastIndexOf("-")).replace("-p","").replace(':',""); 
     539    int patch_num = patch.toInt(); 
     540    QVector<SFbsdUpdatesDescription> descrs = updateDescriptions(release); 
     541 
     542    QString ret = tr("Base system update"); 
     543 
     544    for(int i=0; i<descrs.size(); i++) 
     545    { 
     546        if (descrs[i].mUpdateNo == patch_num) 
     547        { 
     548            ret = descrs[i].mDescription; 
     549            break; 
     550        } 
     551    } 
     552    return ret; 
     553} 
  • src-qt4/pc-updatecenter/syscontroller.h

    r08cf0aa rc21cafa  
    113113 
    114114    QVector<SFbsdUpdatesDescription> mvFbsdUpdateDescriptions; 
     115    QString mCurrentFbsdDescription; 
    115116 
    116117    void parseCheckPCBSDLine(QString line); 
     
    121122    void parseFreeBSDUpdateLine(QString line); 
    122123 
     124    QString fbsdUpdateDescription(QString line); 
     125 
    123126 
    124127}; 
  • src-qt4/pc-updatecenter/updatecontroller.cpp

    r43257ed rc21cafa  
    2626 
    2727#include <QDebug> 
     28#include <QCoreApplication> 
    2829#include <unistd.h> 
    2930 
     
    245246    Q_UNUSED(exitStatus) 
    246247 
     248    slotProcessRead(); 
     249 
    247250    switch (currentState()) 
    248251    { 
  • src-sh/pbi-manager/pbime/pbimount

    ra7429d5 rb611b6c  
    4040 
    4141mount_dirs() { 
     42 
     43   # Check some of the common items to mount into the PBI container 
    4244   is_mounted "${pDir}/virtbase" || $NULLFS / "${pDir}/virtbase" 
    4345   is_mounted "${pDir}/virtbase/dev" || mount -t devfs devfs "${pDir}/virtbase/dev" 
     
    4547   is_mounted "${pDir}/virtbase/var/run" || $NULLFS ${pDir}/run "${pDir}/virtbase/var/run" 
    4648   is_mounted "${pDir}/virtbase/compat/linux" || $NULLFS ${1}/linux "${pDir}/virtbase/compat/linux" 
     49 
     50   # Sort out the items to mount into the PBI container 
     51   for i in `mount | grep -e "(zfs" -e "(smbfs" -e "(nfs" -e "(ufs" -e "(msdos" -e "(ntfs" | grep -e "on /" | grep -v "/usr/jails" | grep -v "/usr/pbi" | grep -v "/usr/local" | awk '{print $3}'` 
     52   do 
     53     if [ "$i" = "/" ] ; then continue ; fi 
     54     is_mounted "${pDir}/virtbase${i}" || $NULLFS ${i} "${pDir}/virtbase${i}" 
     55   done 
     56 
     57   # Mount any system-wide fonts / cursors / icons into the PBI container 
    4758   if [ -d "${pDir}/virtbase/usr/local/etc/fonts" ] ; then 
    4859      is_mounted "${pDir}/virtbase/usr/local/etc/fonts" || $NULLFS /usr/local/etc/fonts "${pDir}/virtbase/usr/local/etc/fonts" 
     
    5465      is_mounted "${pDir}/virtbase/usr/local/lib/X11/icons" || $NULLFS /usr/local/lib/X11/icons "${pDir}/virtbase/usr/local/lib/X11/icons" 
    5566   fi 
    56    is_mounted "${pDir}/virtbase/tmp" || $NULLFS /tmp "${pDir}/virtbase/tmp" 
    57    is_mounted "${pDir}/virtbase/usr/home" || $NULLFS /usr/home "${pDir}/virtbase/usr/home" 
    5867 
    59    # Check if we need to mount linprocfs 
     68   # Check if we need to mount linprocfs in the PBI container 
    6069   if [ -d "${pDir}/virtbase/compat/linux/proc" ] ; then 
    6170      is_mounted "${pDir}/virtbase/compat/linux/proc" || mount -t linprocfs linproc "${pDir}/virtbase/compat/linux/proc" 
    6271   fi 
    63  
    64    for i in `ls -d /usr/home/* 2>/dev/null` 
    65    do 
    66       is_mounted "${i}"  
    67       if [ $? -eq 0 ] ;then 
    68          is_mounted "${pDir}/virtbase${i}" || $NULLFS ${i} "${pDir}/virtbase${i}" 
    69       fi 
    70  
    71    done 
    7272 
    7373   sync 
     
    8282   cp /usr/pbi/.ldconfig "${pDir}/virtbase/var/run/ldconfig" 
    8383   chroot "${pDir}/virtbase" /var/run/ldconfig start >/dev/null 2>/dev/null 
    84    sleep 1 
     84   sleep 0.2 
    8585   sync 
    8686} 
    8787 
    8888umount_pbidir() { 
    89    is_mounted "${pDir}/virtbase/usr/local/etc/fonts" && umount ${pDir}/virtbase/usr/local/etc/fonts 
    90    is_mounted "${pDir}/virtbase/usr/local/etc" && umount ${pDir}/virtbase/usr/local/etc 
    91    is_mounted "${pDir}/virtbase/usr/local/lib/X11/fonts" && umount ${pDir}/virtbase/usr/local/lib/X11/fonts 
    92    is_mounted "${pDir}/virtbase/usr/local/lib/X11/icons" && umount ${pDir}/virtbase/usr/local/lib/X11/icons 
    93    is_mounted "${pDir}/virtbase/usr/local" && umount ${pDir}/virtbase/usr/local 
    94    is_mounted "${pDir}/virtbase/tmp" && umount ${pDir}/virtbase/tmp 
    95    is_mounted "${pDir}/virtbase/dev" && umount ${pDir}/virtbase/dev 
    96    is_mounted "${pDir}/virtbase/var/run" && umount ${pDir}/virtbase/var/run 
    97    is_mounted "${pDir}/virtbase/compat/linux/proc" && umount ${pDir}/virtbase/compat/linux/proc 
    98    is_mounted "${pDir}/virtbase/compat/linux" && umount ${pDir}/virtbase/compat/linux 
    99    for i in `ls -d ${pDir}/virtbase/usr/home/* 2>/dev/null` 
     89   for i in `mount | grep "on ${pDir}" | tail -r | awk '{print $3}'` 
    10090   do 
    101       is_mounted "${i}" && umount ${i} 
     91     echo "Unmounting ${i}" 
     92     umount -f ${i} 
     93     sleep 0.1 
    10294   done 
    103    is_mounted "${pDir}/virtbase/usr/home" && umount ${pDir}/virtbase/usr/home 
    104    is_mounted "${pDir}/virtbase" && umount ${pDir}/virtbase 
    10595} 
    10696 
     
    129119check_pbidir "${2}" 
    130120mount_dirs "${2}" 
    131 mount_dirs "${2}" 
Note: See TracChangeset for help on using the changeset viewer.