[Bug 331685] grub won't boot after upgrade + various