Changeset 39d0dbc


Ignore:
Timestamp:
01/27/14 08:13:43 (6 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2
Children:
75f959d
Parents:
886aa62
Message:

Use the GhostBSD GPT partitioning as our default when picking a GPT partition
to install to. I will need to do some investigation as to how this works with Mac / Boot-Camp,
but that may be a seperate issue.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-sysinstall/backend/functions-disk.sh

    r29e7001 r39d0dbc  
    775775  stop_gjournal "${slice}" 
    776776 
    777   if [ "${INSTALLTYPE}" = "GhostBSD" ] 
    778   then 
    779     if [ "${_intBOOT}" = "GRUB" ] ; then 
    780       rc_halt "gpart modify -t bios-boot ${DISK}" 
    781       # Doing a GRUB stamp? Lets save it for post-install 
    782       echo "${DISK}" >> ${TMPDIR}/.grub-install 
    783     else 
    784       rc_halt "gpart modify -t freebsd-boot -i ${slicenum} ${DISK}" 
    785       echo_log "Stamping boot sector on ${DISK}" 
    786       rc_halt "gpart bootcode -b /boot/pmbr ${DISK}" 
    787     fi 
    788     slice=`echo "${1}:${3}:gpt" | 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 
    789781  else 
    790     # Make sure we have disabled swap on this drive 
    791     if [ -e "${slice}b" ] 
    792     then 
    793      swapoff ${slice}b >/dev/null 2>/dev/null 
    794      swapoff ${slice}b.eli >/dev/null 2>/dev/null 
    795     fi 
    796     # Modify partition type 
    797     echo_log "Running gpart modify on ${DISK}" 
    798     rc_halt "gpart modify -t freebsd -i ${slicenum} ${DISK}" 
    799     sleep 2 
    800     # Clean up old partition 
    801     echo_log "Cleaning up $slice" 
    802     rc_halt "dd if=/dev/zero of=${DISK}p${slicenum} count=1024" 
    803     sleep 4 
    804     # Init the MBR partition 
    805     rc_halt "gpart create -s BSD ${DISK}p${slicenum}" 
    806     # Stamp the bootloader 
    807     sleep 4 
    808     rc_halt "gpart bootcode -b /boot/boot ${DISK}p${slicenum}" 
    809     # Set the slice to the format we'll be using for gpart later 
    810     slice=`echo "${1}:${3}:gptslice" | sed 's|/|-|g'` 
    811   fi 
     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'` 
     787 
    812788  # Lets save our slice, so we know what to look for in the config file later on 
    813789  if [ -z "$WORKINGSLICES" ] 
Note: See TracChangeset for help on using the changeset viewer.