Changeset 54d2124


Ignore:
Timestamp:
07/29/14 12:56:09 (3 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.3, releng/10.1
Children:
19bab26
Parents:
3da6dccc
Message:

Only use the --modules flag for grub-install when doing installs to GPT
which has the space for the extra modules

Location:
src-sh
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-sh/libsh/functions.sh

    r04aeb2a r54d2124  
    807807     echo "$disk" | grep -q "gptid" 
    808808     if [ $? -eq 0 ] ; then 
     809        GRUBFLAGS="--modules='zfs part_gpt part_bsd geli'" 
    809810        # Just a GPTID, resolve it down to real device 
    810811        disk="$(map_gptid_to_dev ${i})" 
     
    824825     # Re-install GRUB on this disk 
    825826     echo "Installing GRUB to $disk" >&2 
    826      grub-install --modules='zfs part_gpt part_bsd geli' /dev/${disk} 
     827     grub-install $GRUBFLAGS /dev/${disk} 
    827828  done 
    828829  return 0 
  • src-sh/lpreserver/backend/functions.sh

    r04aeb2a r54d2124  
    504504   else 
    505505      # Creating a GPT disk 
     506      GRUBFLAGS="--modules='zfs part_gpt part_bsd geli'" 
    506507      rc_halt_s "gpart create -s GPT $disk" 
    507508      rc_halt_s "gpart add -b 34 -s 1M -t bios-boot $disk" 
     
    519520   # Lastly we need to stamp GRUB 
    520521   echo "Stamping GRUB on: $disk" 
    521    rc_halt_s "grub-install --modules='zfs part_gpt part_bsd geli' --force /dev/${disk}" 
     522   rc_halt_s "grub-install $GRUBFLAGS --force /dev/${disk}" 
    522523 
    523524   echo "Added $disk ($aDev) to zpool $pool. Resilver will begin automatically." 
  • src-sh/pc-sysinstall/backend/functions-unmount.sh

    r04aeb2a r54d2124  
    249249  if [ -e "${TMPDIR}/.grub-install-geli" ] ; then 
    250250     echo "GRUB_ENABLE_CRYPTODISK=y" >> ${FSMNT}/usr/local/etc/default/grub 
     251     GRUBFLAGS="--modules='zfs part_gpt part_bsd geli'" 
    251252  fi 
    252253 
     
    263264 
    264265    # Stamp GRUB now 
    265     rc_halt "chroot ${FSMNT} grub-install --modules='zfs part_gpt part_bsd geli' --force $gDisk" 
     266    rc_halt "chroot ${FSMNT} grub-install $GRUBFLAGS --force $gDisk" 
    266267  done < ${TMPDIR}/.grub-install 
    267268 
Note: See TracChangeset for help on using the changeset viewer.