Generated command lines may repeat the image name, or use
"placeholder", but not both.

(Note that after 429:664e69, tboot doesn't skip command line arguments 
any more - that will be addressed by the last patch in this series).

Martin

# HG changeset patch
# User Martin Wilck <martin.wi...@ts.fujitsu.com>
# Date 1456242076 -3600
#      Tue Feb 23 16:41:16 2016 +0100
# Node ID 48adbc8bf254a753779c7f55f00b3e8a3361b03c
# Parent  bd5f195755b19ff9ab6c26851c25e2832cf8033a
grub2, xen: insert just one dummy command line argument

Generated command lines may repeat the image name, or use
"placeholder", but not both.

diff -r bd5f195755b1 -r 48adbc8bf254 tboot/20_linux_xen_tboot
--- a/tboot/20_linux_xen_tboot	Tue Feb 23 14:52:51 2016 +0100
+++ b/tboot/20_linux_xen_tboot	Tue Feb 23 16:41:16 2016 +0100
@@ -104,9 +104,9 @@
 	echo	'$tmessage'
 	multiboot	${rel_tboot_dirname}/${tboot_basename} ${rel_tboot_dirname}/${tboot_basename} ${tboot_args}
 	echo	'$xmessage'
-	module	${rel_xen_dirname}/${xen_basename} ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} ${iommu_args}
+	module	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} ${iommu_args}
 	echo	'$lmessage'
-	module	${rel_dirname}/${basename} ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
+	module	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
 EOF
   if test -n "${initrd}" ; then
     message="$(gettext_printf "Loading initial ramdisk ...")"
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
tboot-devel mailing list
tboot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tboot-devel

Reply via email to