Changeset b7a045d


Ignore:
Timestamp:
06/24/13 07:17:53 (13 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
68ab4df
Parents:
7d50894
Message:

Fix a bug installing GRUB to additional GPT / ZFS raidz partitions

File:
1 edited

Legend:

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

    racdd4b9 rb7a045d  
    107107 
    108108  # Check if the target disk is using GRUB 
    109   grep -q "/dev/$2" ${TMPDIR}/.grub-install 2>/dev/null 
     109  grep -q "/dev/$3" ${TMPDIR}/.grub-install 2>/dev/null 
    110110  if [ $? -eq 0 ] ; then 
    111111     _tBL="GRUB" 
     
    372372      if [ $? -eq 0 -a "$FS" = "ZFS" ] ; then 
    373373        if [ "${_pType}" = "gpt" -o "${_pType}" = "gptslice" ] ; then 
    374           XTRAOPTS=$(setup_zfs_mirror_parts "$XTRAOPTS" "${_pDisk}p${CURPART}") 
     374          XTRAOPTS=$(setup_zfs_mirror_parts "$XTRAOPTS" "${_pDisk}p${CURPART}" "${_pDisk}") 
    375375        elif [ "${_pType}" = "apm" ] ; then 
    376           XTRAOPTS=$(setup_zfs_mirror_parts "$XTRAOPTS" "${_pDisk}s${CURPART}") 
     376          XTRAOPTS=$(setup_zfs_mirror_parts "$XTRAOPTS" "${_pDisk}s${CURPART}" "${_pDisk}") 
    377377        else 
    378           XTRAOPTS=$(setup_zfs_mirror_parts "$XTRAOPTS" "${_wSlice}${PARTLETTER}") 
     378          XTRAOPTS=$(setup_zfs_mirror_parts "$XTRAOPTS" "${_wSlice}${PARTLETTER}" "${_pDisk}") 
    379379        fi 
    380380      fi 
Note: See TracChangeset for help on using the changeset viewer.