Changeset e0f59ee


Ignore:
Timestamp:
05/13/14 10:45:09 (13 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
735b525
Parents:
7ed07e2 (diff), 4466367 (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:
28 added
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-installdialog/pc-installdialog.sh

    r8a5b8ec r7ed07e2  
    648648   # Now the packages 
    649649   if [ "$SYSTYPE" = "desktop" ] ; then 
    650      echo "installPackages=pcbsd-base pcbsd-meta-kde pcbsd-meta-kde-accessibility pcbsd-meta-kde-artwork pcbsd-meta-kde-graphics pcbsd-meta-kde-multimedia pcbsd-meta-kde-network pcbsd-meta-kde-pim" >> ${CFGFILE} 
     650     echo "installPackages=misc/pcbsd-base misc/pcbsd-meta-kde" >> ${CFGFILE} 
    651651     echo "" >> ${CFGFILE} 
    652652     # Set our markers for desktop to run the first-time boot wizards 
     
    656656     echo "runCommand=touch /var/.pcbsd-firstgui" >> ${CFGFILE} 
    657657   else 
    658      echo "installPackages=trueos-base" >> ${CFGFILE} 
     658     echo "installPackages=misc/trueos-base" >> ${CFGFILE} 
    659659     echo "" >> ${CFGFILE} 
    660660     echo "runCommand=sh /usr/local/share/pcbsd/scripts/sys-init.sh server" >> ${CFGFILE} 
Note: See TracChangeset for help on using the changeset viewer.