From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches
Date: Fri, 20 Sep 2013 10:15:43 +0100
Message-ID: <1379668546-5267-4-git-send-email-wei.liu2@citrix.com>
References: <1379668546-5267-1-git-send-email-wei.liu2@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1379668546-5267-1-git-send-email-wei.liu2@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>, ian.jackson@eu.citrix.com, ian.campbell@citrix.com
List-Id: xen-devel@lists.xenproject.org

Nowadays we run Squeeze onwards only.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 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 () {
-- 
1.7.10.4