Since change set 429:664e69, tboot doesn't skip over the first
command line argument any more. Remove code that inserted placeholders
to compensate the previous behavior.
(I deliberately submit this patch last, so that the rest of the series
might be useful also for distro maintainers that can't or won't take
429:664e69 because of the usage change it implies).
# HG changeset patch
# User Martin Wilck <martin.wi...@ts.fujitsu.com>
# Date 1456320716 -3600
# Wed Feb 24 14:31:56 2016 +0100
# Branch mw-001
# Node ID 668faaaddf616af64b730cd63e6b745be5ff1155
# Parent e218c239de4be18bb0c6ad6beb9b6db3a24ce405
grub2: tboot doesn't skip first argument any more
Since change set 429:664e69, tboot doesn't skip over the first
command line argument any more. Remove code that inserted placeholders
to compensate the previous behavior.
diff -r e218c239de4b -r 668faaaddf61 tboot/20_linux_tboot
--- a/tboot/20_linux_tboot Wed Feb 24 14:23:07 2016 +0100
+++ b/tboot/20_linux_tboot Wed Feb 24 14:31:56 2016 +0100
@@ -135,8 +135,8 @@
printf '%s\n' "${prepare_boot_cache}"
xmessage="$(gettext_printf "Loading tboot %s ..." ${tboot_version})"
lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
- tbargs=`merge_spaces ${rel_tboot_dirname}/${tboot_basename} ${tboot_args}`
- lxargs=`merge_spaces ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} ${iommu_args} ${mb_extra_kernel}`
+ tbargs=`merge_spaces ${tboot_args}`
+ lxargs=`merge_spaces root=${linux_root_device_thisversion} ro ${args} ${iommu_args} ${mb_extra_kernel}`
cat << EOF
echo '$xmessage'
${mb_directive} ${rel_tboot_dirname}/${tboot_basename} ${tbargs}
@@ -147,7 +147,7 @@
message="$(gettext_printf "Loading initial ramdisk ...")"
cat << EOF
echo '$message'
- ${mb_mod_directive} ${rel_dirname}/${initrd} ${rel_dirname}/${initrd}
+ ${mb_mod_directive} ${rel_dirname}/${initrd}
EOF
fi
if test -n "${sinit_list}" ; then
@@ -155,7 +155,7 @@
message="$(gettext_printf "Loading sinit $i ...")"
cat << EOF
echo '$message'
- ${mb_mod_directive} ${rel_dirname}/${i} ${rel_dirname}/${i}
+ ${mb_mod_directive} ${rel_dirname}/${i}
EOF
done
fi
diff -r e218c239de4b -r 668faaaddf61 tboot/20_linux_xen_tboot
--- a/tboot/20_linux_xen_tboot Wed Feb 24 14:23:07 2016 +0100
+++ b/tboot/20_linux_xen_tboot Wed Feb 24 14:31:56 2016 +0100
@@ -126,9 +126,9 @@
xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
tmessage="$(gettext_printf "Loading Tboot %s ..." ${tboot_version})"
lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
- tbargs=`merge_spaces ${rel_tboot_dirname}/${tboot_basename} ${tboot_args}`
- xnargs=`merge_spaces placeholder ${xen_args} ${iommu_args}`
- lxargs=`merge_spaces placeholder root=${linux_root_device_thisversion} ro ${args}`
+ tbargs=`merge_spaces ${tboot_args}`
+ xnargs=`merge_spaces ${xen_args} ${iommu_args}`
+ lxargs=`merge_spaces root=${linux_root_device_thisversion} ro ${args}`
cat << EOF
echo '$tmessage'
multiboot ${rel_tboot_dirname}/${tboot_basename} ${tbargs}
@@ -141,7 +141,7 @@
message="$(gettext_printf "Loading initial ramdisk ...")"
cat << EOF
echo '$message'
- module ${rel_dirname}/${initrd} ${rel_dirname}/${initrd}
+ module ${rel_dirname}/${initrd}
EOF
fi
if test -n "${sinit_list}" ; then
@@ -149,7 +149,7 @@
message="$(gettext_printf "Loading sinit $i ...")"
cat << EOF
echo '$message'
- module ${rel_dirname}/${i} ${rel_dirname}/${i}
+ module ${rel_dirname}/${i}
EOF
done
fi
------------------------------------------------------------------------------
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
