I'm going to want it in a subsequent patch Signed-off-by: Ian Campbell <ian.campb...@citrix.com> Acked-by: Ian Jackson <ian.jack...@eu.citrix.com> --- Osstest/Debian.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 66d6839..c76d63a 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 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel