Changeset efde016


Ignore:
Timestamp:
02/11/14 13:47:31 (7 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
a4c888d
Parents:
23d2792 (diff), 772cd3d (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:
3 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager/pbime/pbimount

    r521677a r064e485  
    9797 
    9898   is_mounted "${pDir}/virtbase/dev" || (mount -t devfs devfs "${pDir}/virtbase/dev" ; $MNTSLEEP ) 
     99   is_mounted "${pDir}/virtbase/dev/fd" || (mount -t fdescfs fdesc "${pDir}/virtbase/dev/fd" ; $MNTSLEEP ) 
    99100   is_mounted "${pDir}/virtbase/usr/local" || ($NULLFS ${1}/local "${pDir}/virtbase/usr/local" ; $MNTSLEEP ) 
    100101   is_mounted "${pDir}/virtbase/var/run" || ($NULLFS ${pDir}/run "${pDir}/virtbase/var/run" ; $MNTSLEEP ) 
  • src-sh/pc-sysinstall/backend/functions-cleanup.sh

    r3018894 r772cd3d  
    238238    echo "procfs                        /proc                   procfs          rw              0       0" >> ${FSTAB} 
    239239    echo "linprocfs             /compat/linux/proc      linprocfs       rw              0       0" >> ${FSTAB} 
     240    echo "fdesc                 /dev/fd         fdescfs         rw      0       0" >> ${FSTAB} 
    240241  fi 
    241242 
  • src-qt4/EasyPBI/mainGUI.cpp

    r1f245a6 r23d2792  
    443443void MainGUI::on_actionPBI_Modules_triggered(){ 
    444444  //Open the PC-BSD wiki to the module builders guide 
    445    QString target_url = "http://wiki.pcbsd.org/index.php/PBI_Module_Builder_Guide/9.2"; 
     445   QString target_url = "http://wiki.pcbsd.org/index.php/PBI_Module_Builder_Guide/10.0"; 
    446446   qDebug() << "Opening URL:" << target_url;  
    447447   target_url.prepend("xdg-open "); 
Note: See TracChangeset for help on using the changeset viewer.