SHA256
1
0
forked from pool/tboot
Marcus Meissner 2016-05-19 11:10:19 +00:00 committed by Git OBS Bridge
parent fe1ddf8a2e
commit 9611599ff0

View File

@ -23,11 +23,11 @@ v3:
References: bnc#865815 References: bnc#865815
Porting to tboot in order to fix duplicated xen entries Porting to tboot in order to fix duplicated xen entries
Index: tboot-1.8.0/tboot/20_linux_tboot Index: tboot-1.9.4/tboot/20_linux_tboot
=================================================================== ===================================================================
--- tboot-1.8.0.orig/tboot/20_linux_tboot --- tboot-1.9.4.orig/tboot/20_linux_tboot
+++ tboot-1.8.0/tboot/20_linux_tboot +++ tboot-1.9.4/tboot/20_linux_tboot
@@ -166,6 +166,49 @@ while [ "x${tboot_list}" != "x" ] && [ " @@ -225,6 +225,49 @@ while [ "x${tboot_list}" != "x" ] && [ "
break break
fi fi
done done
@ -77,11 +77,11 @@ Index: tboot-1.8.0/tboot/20_linux_tboot
if test -n "${initrd}" ; then if test -n "${initrd}" ; then
echo "Found initrd image: ${dirname}/${initrd}" >&2 echo "Found initrd image: ${dirname}/${initrd}" >&2
else else
Index: tboot-1.8.0/tboot/20_linux_xen_tboot Index: tboot-1.9.4/tboot/20_linux_xen_tboot
=================================================================== ===================================================================
--- tboot-1.8.0.orig/tboot/20_linux_xen_tboot --- tboot-1.9.4.orig/tboot/20_linux_xen_tboot
+++ tboot-1.8.0/tboot/20_linux_xen_tboot +++ tboot-1.9.4/tboot/20_linux_xen_tboot
@@ -30,6 +30,12 @@ fi @@ -52,6 +52,12 @@ fi
export TEXTDOMAIN=grub export TEXTDOMAIN=grub
export TEXTDOMAINDIR=${prefix}/share/locale export TEXTDOMAINDIR=${prefix}/share/locale
@ -94,7 +94,7 @@ Index: tboot-1.8.0/tboot/20_linux_xen_tboot
CLASS="--class gnu-linux --class gnu --class os --class xen" CLASS="--class gnu-linux --class gnu --class os --class xen"
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
@@ -147,9 +153,17 @@ linux_list=`for i in /boot/vmlinu[xz]-* @@ -185,9 +191,17 @@ linux_list=`for i in /boot/vmlinu[xz]-*
if [ "x${linux_list}" = "x" ] ; then if [ "x${linux_list}" = "x" ] ; then
exit 0 exit 0
fi fi