|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [OSSTEST PATCH 36/49] buster: setupboot_grub2: Handle missing policy file bug
This is a complex interaction between update-grub and the Xen build
system on ARM64. Not sure exactly who to blame but since we have our
own 20_linux_xen bodge, let's wait until we don't.
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
Osstest/Debian.pm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 0386ff7a..51217fb4 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -496,7 +496,17 @@ sub setupboot_grub2 ($$$$) {
" kernel $entry->{KernVer}, not $want_kernver)");
} elsif ($want_xsm && !defined $entry->{Xenpolicy}) {
logm("(skipping entry at $entry->{StartLine}..$.;".
- " XSM policy file not present)");
+ " XSM policy file not mentioned)");
+ } elsif ($ho->{Suite} =~ m/buster/ &&
+ defined $entry->{Xenpolicy} &&
+ !$bootfiles{
+ $entry->{Xenpolicy} =~ m{^/?} ? $' : die
+ }) {
+ # Our 20_linux_xen bodge with buster's update-grub
+ # generates entries which mention /boot/xenpolicy-xen
+ # even though that file doesn't exist on ARM64.
+ logm("(skipping entry at $entry->{StartLine}..$.;".
+ " XSM policy file not on disk!)");
} else {
# yes!
last;
--
2.20.1
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |