grub: fix build; fix zfs detection