Changeset 87e7f725


Ignore:
Timestamp:
10/10/13 08:07:56 (14 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
2513d5a
Parents:
15de9d8
Message:

Update where we do some of the 4K alignment for disks

Location:
src-sh/pc-sysinstall/backend
Files:
2 edited

Legend:

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

    r3018894 r87e7f725  
    135135      echo "Setting up ZFS disk $_zvars" >>${LOGOUT} 
    136136      init_gpt_full_disk "$_zvars" "$_tBL" >/dev/null 2>/dev/null 
    137       #rc_halt "gpart add ${SOUT} -t freebsd-zfs ${_zvars}" >/dev/null 2>/dev/null 
    138137 
    139138      # If we are not using GRUB we need to add pmbr / gptzfsboot 
     
    405404      if [ "${_pType}" = "gpt" ] ; then 
    406405        sleep 2 
    407         aCmd="gpart add ${SOUT} -t ${PARTYPE} ${_pDisk}" 
     406        aCmd="gpart add -a 4k ${SOUT} -t ${PARTYPE} ${_pDisk}" 
    408407      elif [ "${_pType}" = "gptslice" ]; then 
    409408        sleep 2 
     
    414413      else 
    415414        sleep 2 
    416  
    417         # When we install to ZFS on a MBR slice, align the partition to 512b 
    418         # This corrects some issues with cranky disks causing gpart alignment 
    419         # to 4k to fail, resulting in zfsboot hanging... 
    420         aOpt="" 
    421         if [ "$CURPART" = "1" -a "$PARTYPE" = "freebsd-zfs" ] ; then 
    422            aOpt="-a 512b" 
    423         fi 
    424         aCmd="gpart add ${SOUT} ${aOpt} -t ${PARTYPE} -i ${CURPART} ${_wSlice}" 
     415        # MBR type 
     416        aCmd="gpart add -a 4k ${SOUT} -t ${PARTYPE} -i ${CURPART} ${_wSlice}" 
    425417      fi 
    426418 
     
    433425         do 
    434426            echo_log "Cloning disk layout to ZFS disk ${zC}" 
    435             rc_halt "gpart add ${SOUT} -t ${PARTYPE} ${zC}" 
     427            rc_halt "gpart add -a 4k ${SOUT} -t ${PARTYPE} ${zC}" 
    436428            if [ "$PARTYPE" = "freebsd-swap" ] ; then 
    437429               # If this is the first device, save the original swap dev 
  • src-sh/pc-sysinstall/backend/functions-disk.sh

    rdfee0c1 r87e7f725  
    687687  _intBOOT=$2 
    688688  
    689   startblock="2016" 
    690  
    691689  # Set our sysctl so we can overwrite any geom using drives 
    692690  sysctl kern.geom.debugflags=16 >>${LOGOUT} 2>>${LOGOUT} 
Note: See TracChangeset for help on using the changeset viewer.