Update grub 2.00 to version 2.00.5107 from the bazaar repository, the same version used in gentoo.
Update the grub configuration script to handle more complex filesystem layouts including /boot on zfs and btrfs.