Having grub.cfg generated at the wrong time has confused the
update code path.  So let's try to clean that up.  This patch
cane probably be undone at some point, but I don't think it matters
hugely.