Re: [Xen-devel] [PATCH OSSTEST 3/6] Osstest: purge Lenny branches

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Fri, 2013-09-20 at 10:15 +0100, Wei Liu wrote:
> Nowadays we run Squeeze onwards only.

While I'm pretty sure this is correct I think it's not urgent and I'd
rather wait for Ian Jackson to return rather than committing this sort
of thing myself.

> 
> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
> ---
>  Osstest/Debian.pm |    2 --
>  ts-host-install   |   10 ----------
>  ts-xen-build-prep |    7 -------
>  3 files changed, 19 deletions(-)
> 
> diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
> index 3a26571..f6dba9a 100644
> --- a/Osstest/Debian.pm
> +++ b/Osstest/Debian.pm
> @@ -72,8 +72,6 @@ sub debian_boot_setup ($$$$;$) {
>      my $bootloader;
>      if ( $ho->{Flags}{'need-uboot-bootscr'} ) {
>       $bootloader= setupboot_uboot($ho, $want_kernver, $xenhopt, $kopt);
> -    } elsif ($ho->{Suite} =~ m/lenny/) {
> -        $bootloader= setupboot_grub1($ho, $want_kernver, $xenhopt, $kopt);
>      } else {
>          $bootloader= setupboot_grub2($ho, $want_kernver, $xenhopt, $kopt);
>      }
> diff --git a/ts-host-install b/ts-host-install
> index dfbc950..12dd77b 100755
> --- a/ts-host-install
> +++ b/ts-host-install
> @@ -72,16 +72,6 @@ END
>  
>      our $vgname= $ho->{Name};
>  
> -    if ($ho->{Suite} =~ m/lenny/) {
> -        $vgname .= ".$c{TestHostDomain}";
> -        target_editfile_root($ho, '/boot/grub/menu.lst', sub {
> -            while (<EI>) {
> -                s/^terminal.*/terminal --timeout=10 serial console/;
> -                print EO or die $!;
> -            }
> -        });
> -    }
> -
>      my $lvs= target_cmd_output_root($ho, 'lvdisplay --colon');
>      foreach my $l (split /\n/, $lvs) {
>          logm("| $l");
> diff --git a/ts-xen-build-prep b/ts-xen-build-prep
> index b1e6a6c..bc436b8 100755
> --- a/ts-xen-build-prep
> +++ b/ts-xen-build-prep
> @@ -174,13 +174,6 @@ sub prep () {
>  
>      target_cmd_root($ho, "chmod -R a+r /usr/share/git-core/templates");
>      # workaround for Debian #595728
> -
> -    if ($ho->{Suite} !~ m/lenny/) {
> -        target_putfilecontents_stash($ho,60,<<'END','/home/osstest/.hgrc');
> -[extensions]
> -mq=
> -END
> -    }
>  }
>  
>  sub cacheing_git_mount () {



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