From patchwork Fri Nov 21 13:17:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 41313 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 794B12452C for ; Fri, 21 Nov 2014 13:19:50 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id bs8sf3274029wib.6 for ; Fri, 21 Nov 2014 05:19:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=dlLGHFtzY3mI13wC/L4itFvn5Z61nX8tu030bgdd3rc=; b=XK3uOfC4in8T3fEANKeRUhSlgflkQEz3lNzwx3gXHF7+L43RuTuOfc0IVnKew/vHP/ aQ392+44lufZ8Rk2uLJ45kjGI3mB6XcH3mxUTXFbypVzNeh62YgTv+72BhLF5hRQdpdY pLNdDz1sNPs5/zqH9yJwN6dBj+Pq4U5NY6KON2WUCUJCOAzcPJthUlOGMDs+w14tgnbG cpAKLvHM+Ao75pG3BwosoAEfrNmCDHAqQ9avENKAC2F7IJebQ9ohxiVzOCKTrOpqTKuJ WU4tx77oCtUJcygO5dqS4o+QweB425GJzXjv+TijoejR5nMsi7pagQhlwBk6Yoc7CxaS 2J7g== X-Gm-Message-State: ALoCoQnxZdCGW5bcD22KwtsSSUbR1X+3fTctuB70fC37cgUsTiZ1H973ab12+IMEUJUYA/m3vVE5 X-Received: by 10.180.85.97 with SMTP id g1mr9228274wiz.0.1416575983563; Fri, 21 Nov 2014 05:19:43 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.166 with SMTP id f6ls187484lam.8.gmail; Fri, 21 Nov 2014 05:19:43 -0800 (PST) X-Received: by 10.152.179.67 with SMTP id de3mr4403534lac.73.1416575983303; Fri, 21 Nov 2014 05:19:43 -0800 (PST) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id ju18si5407535lab.8.2014.11.21.05.19.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 05:19:43 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by mail-la0-f48.google.com with SMTP id s18so4132883lam.7 for ; Fri, 21 Nov 2014 05:19:43 -0800 (PST) X-Received: by 10.152.8.170 with SMTP id s10mr4542808laa.56.1416575983171; Fri, 21 Nov 2014 05:19:43 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp87304lbc; Fri, 21 Nov 2014 05:19:42 -0800 (PST) X-Received: by 10.220.199.70 with SMTP id er6mr4418731vcb.68.1416575981905; Fri, 21 Nov 2014 05:19:41 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id wz1si2250551vcb.80.2014.11.21.05.19.19 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 21 Nov 2014 05:19:41 -0800 (PST) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xro5Y-0007TB-02; Fri, 21 Nov 2014 13:17:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xro5V-0007Pk-Tj for xen-devel@lists.xen.org; Fri, 21 Nov 2014 13:17:26 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 19/75-24124-56B3F645; Fri, 21 Nov 2014 13:17:25 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1416575843!7267635!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25897 invoked from network); 21 Nov 2014 13:17:24 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 21 Nov 2014 13:17:24 -0000 X-IronPort-AV: E=Sophos;i="5.07,431,1413244800"; d="scan'208";a="193695994" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Fri, 21 Nov 2014 08:17:21 -0500 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Xro5P-0003BF-OX; Fri, 21 Nov 2014 13:17:20 +0000 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Fri, 21 Nov 2014 13:17:19 +0000 From: Ian Campbell To: Date: Fri, 21 Nov 2014 13:17:04 +0000 Message-ID: <1416575824-15555-15-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1416505070.26869.2.camel@citrix.com> References: <1416505070.26869.2.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v3 15/15] Debian: Create boot.scr with a suffix and copy to boot.scr X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: This ensures that we always have a boot script to boot at least the native Debian kernel and Xen available, even after multiple iterations of installation, which is handy when debugging a system. Signed-off-by: Ian Campbell --- Osstest/Debian.pm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 82669a5..18586fc 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -152,12 +152,12 @@ if test ! -f /boot/$kern ; then exit 1 fi # Save a copy of the original -cp -n /boot/boot /boot/boot.bak -cp -n /boot/boot.scr /boot/boot.scr.bak +cp -n /boot/boot.xen /boot/boot.xen.bak +cp -n /boot/boot.scr.xen /boot/boot.scr.xen.bak xen=`readlink /boot/$xen` -cat >/boot/boot </boot/boot.xen <\$r/boot/boot <\$r/boot/boot.deb <