Changeset a24a288


Ignore:
Timestamp:
Jan 27, 2014 12:34:42 PM (6 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2
Children:
89a6c25
Parents:
35b47b7 (diff), 75f959d (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-installgui/wizardDisk.cpp

    r07eb74c r75f959d  
    424424 
    425425     // This lets the user do nifty stuff like a mirror/raid post-install with a single zpool command 
    426     fileSystem << targetDisk << targetSlice << "/" + rootOpts + ",/tmp(compress=lz4),/usr(canmount=off),/usr/home,/usr/jails,/usr/obj(compress=lz4),/usr/pbi,/usr/ports(compress=lz4),/usr/ports/distfiles(compress=lz4),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4),/var/tmp(compress=lz4)" << fsType << tmp.setNum(totalSize) << "" << tmpPass; 
     426    fileSystem << targetDisk << targetSlice << "/" + rootOpts + ",/tmp(compress=lz4),/usr(canmount=off),/usr/home(compress=lz4),/usr/jails(compress=lz4),/usr/obj(compress=lz4),/usr/pbi(compress=lz4),/usr/ports(compress=lz4),/usr/ports/distfiles(compress=lz4),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4),/var/tmp(compress=lz4)" << fsType << tmp.setNum(totalSize) << "" << tmpPass; 
    427427    sysFinalDiskLayout << fileSystem; 
    428428    fileSystem.clear(); 
  • src-sh/pc-sysinstall/backend/functions-bsdlabel.sh

    r8e9134a r9174840  
    404404      if [ "${_pType}" = "gpt" ] ; then 
    405405        sleep 2 
    406         aCmd="gpart add -a 4k ${SOUT} -t ${PARTYPE} ${_pDisk}" 
     406        if [ "${INSTALLTYPE}" = "GhostBSD" ] 
     407        then 
     408          aCmd="gpart add ${SOUT} -t ${PARTYPE} ${_pDisk}" 
     409        else 
     410          aCmd="gpart add -a 4k ${SOUT} -t ${PARTYPE} ${_pDisk}" 
     411        fi 
    407412      elif [ "${_pType}" = "gptslice" ]; then 
    408413        sleep 2 
  • src-sh/pc-sysinstall/backend/functions-disk.sh

    r07eb74c r39d0dbc  
    775775  stop_gjournal "${slice}" 
    776776 
    777   # Make sure we have disabled swap on this drive 
    778   if [ -e "${slice}b" ] 
    779   then 
    780    swapoff ${slice}b >/dev/null 2>/dev/null 
    781    swapoff ${slice}b.eli >/dev/null 2>/dev/null 
    782   fi 
    783  
    784   # Modify partition type 
    785   echo_log "Running gpart modify on ${DISK}" 
    786   rc_halt "gpart modify -t freebsd -i ${slicenum} ${DISK}" 
    787   sleep 2 
    788  
    789   # Clean up old partition 
    790   echo_log "Cleaning up $slice" 
    791   rc_halt "dd if=/dev/zero of=${DISK}p${slicenum} count=1024" 
    792  
    793   sleep 4 
    794  
    795   # Init the MBR partition 
    796   rc_halt "gpart create -s BSD ${DISK}p${slicenum}" 
    797  
    798   # Stamp the bootloader 
    799   sleep 4 
    800   rc_halt "gpart bootcode -b /boot/boot ${DISK}p${slicenum}" 
    801  
    802   # Set the slice to the format we'll be using for gpart later 
    803   slice=`echo "${1}:${3}:gptslice" | sed 's|/|-|g'` 
     777  if [ "${_intBOOT}" = "GRUB" ] ; then 
     778    rc_halt "gpart modify -t bios-boot ${DISK}" 
     779    # Doing a GRUB stamp? Lets save it for post-install 
     780    echo "${DISK}" >> ${TMPDIR}/.grub-install 
     781  else 
     782    rc_halt "gpart modify -t freebsd-boot -i ${slicenum} ${DISK}" 
     783    echo_log "Stamping boot sector on ${DISK}" 
     784    rc_halt "gpart bootcode -b /boot/pmbr ${DISK}" 
     785  fi 
     786  slice=`echo "${1}:${3}:gpt" | sed 's|/|-|g'` 
    804787 
    805788  # Lets save our slice, so we know what to look for in the config file later on 
  • src-sh/pc-sysinstall/backend/functions-users.sh

    r00f1c03 ra2c78bf  
    4444    # Add the auto-login user line 
    4545    sed -i.bak "s/AutoLoginEnable=false/AutoLoginEnable=true/g" ${FSMNT}/usr/local/kde4/share/config/kdm/kdmrc 
    46   elif [ -a "${INSTALLTYPE}" = "GhostBSD" ] 
     46  elif [ "${INSTALLTYPE}" = "GhostBSD" ] 
    4747  then 
    4848    if [ -n "${VAL}" ] 
     
    199199  done <${CFGF} 
    200200 
    201  
     201# If it is GhostBSD remove the ghostbsd live user. 
     202  if [ "${INSTALLTYPE}" = "GhostBSD" ] 
     203  then 
     204    rc_halt "pw userdel -n ghostbsd -r" 
     205  fi 
     206   
    202207  # Check if we need to enable a user to auto-login to the desktop 
    203208  check_autologin 
  • src-qt4/PCDM/src/pcdm-xprocess.cpp

    r18c6ea0 r35b47b7  
    143143  if(QFile::exists(xhome+"/.xprofile")){ 
    144144    qDebug() << "Run user ~/.xprofile"; 
    145     this->start("sh "+xhome+"/.xprofile");//Cannot start in parallel if it sets env variables 
    146     if(!this->waitForFinished(30000) ){ 
    147       //If it still has not finished this after 30 seconds, kill it 
    148       this->terminate(); 
    149     } 
     145    cmd.prepend(". "+xhome+"/.xprofile; "); 
     146    //Make sure it has executable permissions 
     147    QFile::setPermissions(xhome+"/.xprofile", QFile::permissions(xhome+"/.xprofile") | QFile::ExeOwner); 
    150148  } 
    151149  connect( this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) ); 
Note: See TracChangeset for help on using the changeset viewer.