Changeset 04aeb2a


Ignore:
Timestamp:
07/15/14 13:58:15 (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
e0dace0
Parents:
366cd80
Message:

Add a default list of modules to preload via GRUB. This fixes an
issue with grub-install sometimes not detecting that part_gpt should
be loaded before it can access GPT / ZFS disks

Location:
src-sh
Files:
3 edited

Legend:

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

    r234414e r04aeb2a  
    824824     # Re-install GRUB on this disk 
    825825     echo "Installing GRUB to $disk" >&2 
    826      grub-install /dev/${disk} 
     826     grub-install --modules='zfs part_gpt part_bsd geli' /dev/${disk} 
    827827  done 
    828828  return 0 
  • src-sh/lpreserver/backend/functions.sh

    r5969632 r04aeb2a  
    519519   # Lastly we need to stamp GRUB 
    520520   echo "Stamping GRUB on: $disk" 
    521    rc_halt_s "grub-install --force /dev/${disk}" 
     521   rc_halt_s "grub-install --modules='zfs part_gpt part_bsd geli' --force /dev/${disk}" 
    522522 
    523523   echo "Added $disk ($aDev) to zpool $pool. Resilver will begin automatically." 
  • src-sh/pc-sysinstall/backend/functions-unmount.sh

    r75eb09a r04aeb2a  
    263263 
    264264    # Stamp GRUB now 
    265     rc_halt "chroot ${FSMNT} grub-install --force $gDisk" 
     265    rc_halt "chroot ${FSMNT} grub-install --modules='zfs part_gpt part_bsd geli' --force $gDisk" 
    266266  done < ${TMPDIR}/.grub-install 
    267267 
Note: See TracChangeset for help on using the changeset viewer.