Debian: ARM: only apply no bootloader workaround if xopts{PvMenuLst}

This workaround is only necessary because of how pv-grub-menu works,
so we should only apply both or neither of them.

This results in a long line and I'm about to add a second workaround
to this block, so switch to a regular if block instead of postfixing
on the one command. Move the comment inside that block in preparation
for other workarounds as well.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index f0bcf069f8692494c62e3375f2589a34a0335392..1c071083988db2620045abf199bfd9dbbbb83df7 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -915,15 +915,20 @@ d-i     grub-installer/bootdev          string /dev/xvda
 
 END
 
-    # Debian doesn't currently know what bootloader to install in a
-    # Xen guest on ARM. We install pv-grub-menu above which actually
-    # does what we need, but the installer doesn't treat that as a
-    # "bootloader".
     logm("\$arch is $arch, \$suite is $suite");
-    $preseed_file.= (<<END) if $arch =~ /^arm/ && $suite =~ /wheezy|jessie|sid/;
+    if ($xopts{PvMenuLst} &&
+       $arch =~ /^arm/ &&
+       $suite =~ /wheezy|jessie|sid/ ) {
+
+       # Debian doesn't currently know what bootloader to install in
+       # a Xen guest on ARM. We install pv-grub-menu above which
+       # actually does what we need, but the installer doesn't treat
+       # that as a "bootloader".
+       $preseed_file.= (<<END);
 d-i     nobootloader/confirmation_common boolean true
 
 END
+    }
 
     $preseed_file .= preseed_hook_cmds();