Re: [Xen-devel] [PATCH OSSTEST v2 11/15] distros: attempt pvgrub support for PV Wheezy too.

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

Ian Campbell writes ("[PATCH OSSTEST v2 11/15] distros: attempt pvgrub support 
for PV Wheezy too."):
> diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
> index 8946ab1..ad478ab 100644
> --- a/Osstest/Debian.pm
> +++ b/Osstest/Debian.pm
> @@ -432,7 +432,7 @@ sub preseed_base ($$;@) {
>  
>      $extra_packages ||= '';
>  
> -    return <<"END";
> +    my $preseed= (<<END);

These parens are unnecessary.  (As were the "" before.  Not sure why
they were there.)

> +    $preseed .= <<END if $xopts{EnableBackports};
> +d-i apt-setup/local0/repository string 
> http://$c{DebianMirrorHost}/$c{DebianMirrorSubpath} $suite-backports main

Perhaps this wants \\ (to wrap it) ?

> -    my $extra_packages = "pv-grub-menu" if $xopts{PvMenuLst};
> +    $xopts{EnableBackports} = 1
> +     if $xopts{PvMenuLst} and $suite eq "wheezy";

I normally write this as   $suite =~ m/wheezy/

> +    my $extra_packages = "pv-grub-menu".
> +     ($xopts{EnableBackports} ? "/$suite-backports" : "")
> +         if $xopts{PvMenuLst};

I think this is a rather strange way of doing things.  It's
backwards.  What you mean is probably something like this:

  +    my $extra_packages = "pv-grub-menu".
  +     ($suite =~ m/wheezy/ ? "/$suite-backports" : "")
  +         if $xopts{PvMenuLst};

  +    $xopts{EnableBackports} ||= $extra_packages =~ m#/\S+-backports\b#;

or even better, do away with the EnableBackports xopt altogether and
have preseed_base do it itself automatically.

Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel