From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST v3 20/22] Debian: Collect kernel command line from grub.cfg Date: Wed, 24 Jun 2015 16:32:39 +0100 Message-ID: <1435159961-22292-20-git-send-email-ian.campbell@citrix.com> References: <1435159944.28264.295.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1435159944.28264.295.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org I'm going to want it in a subsequent patch Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- Osstest/Debian.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 62551ac..d7f8e9c 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -460,15 +460,17 @@ sub setupboot_grub2 ($$$$) { die unless $entry; $entry->{Hv}= $1; } - if (m/^\s*multiboot\s*(?:\/boot)?\/(vmlinu[xz]-(\S+))/) { + if (m/^\s*multiboot\s*(?:\/boot)?\/(vmlinu[xz]-(\S+))\s+(.*)/) { die unless $entry; $entry->{KernOnly}= $1; $entry->{KernVer}= $2; + $entry->{KernOpts}= $3; } - if (m/^\s*module\s*(?:\/boot)?\/(vmlinu[xz]-(\S+))/) { + if (m/^\s*module\s*(?:\/boot)?\/(vmlinu[xz]-(\S+))\s+(.*)/) { die unless $entry; $entry->{KernDom0}= $1; $entry->{KernVer}= $2; + $entry->{KernOpts}= $3; } if (m/^\s*module\s*(?:\/boot)?\/(initrd\S+)/) { $entry->{Initrd}= $1; -- 2.1.4