Bug#778907: adt-setup-vm: configure grub only if it is installed

[Martin Pitt]

Control: tag -1 pending

Hey Christian,

Christian Kastner [2015-02-21 18:05 +0100]:
> -if [ "$(chroot "$root" dpkg --print-architecture)" = "i386" ]; then
> +if [ "$(chroot "$root" dpkg --print-architecture)" = "i386" ] && [ -d "$root/etc/default/grub.d" ]; then

That isn't the correct test. /etc/default/grub.d doesn't exist by
default, only /etc/default/grub. This also collides with another fix
that I pushed:

  http://anonscm.debian.org/cgit/autopkgtest/autopkgtest.git/commit/?id=a47abea

So I updated the test to check for "update-grub" instead:

  http://anonscm.debian.org/cgit/autopkgtest/autopkgtest.git/commit/?id=76ce87ec6

vmdebootstrapping sid now works again.

Thanks!

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/autopkgtest-devel/attachments/20150222/126eda6e/attachment.sig>