|
 |
24fce8 |
From ec969de50ea5fa31d98cd00afa6a3f8a43e606a4 Mon Sep 17 00:00:00 2001
|
|
|
24fce8 |
From: Peter Jones <pjones@redhat.com>
|
|
|
24fce8 |
Date: Thu, 2 Jul 2015 14:30:09 -0400
|
|
|
24fce8 |
Subject: [PATCH 10/55] Make the grub1 "defaultkernel" test more reliable.
|
|
|
24fce8 |
|
|
|
24fce8 |
Basically just do it twice with various incarnations of
|
|
|
24fce8 |
--boot-filesystem={/,/boot}
|
|
|
24fce8 |
|
|
|
24fce8 |
Related: rhbz#1184014
|
|
|
24fce8 |
|
|
|
24fce8 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
24fce8 |
---
|
|
|
24fce8 |
test.sh | 3 ++-
|
|
|
24fce8 |
test/results/defaultkernel/g.2 | 1 +
|
|
|
24fce8 |
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
24fce8 |
create mode 100644 test/results/defaultkernel/g.2
|
|
|
24fce8 |
|
|
|
24fce8 |
diff --git a/test.sh b/test.sh
|
|
|
24fce8 |
index 96e0087b1e2..2985fd62bf9 100755
|
|
|
24fce8 |
--- a/test.sh
|
|
|
24fce8 |
+++ b/test.sh
|
|
|
24fce8 |
@@ -299,7 +299,8 @@ grubDisplayTest grub.10 defaulttitle/g.10 --default-title
|
|
|
24fce8 |
grubDisplayTest grub.11 defaulttitle/g.11 --default-title
|
|
|
24fce8 |
|
|
|
24fce8 |
testing="GRUB display default kernel"
|
|
|
24fce8 |
-grubDisplayTest grub.1 defaultkernel/g.1 --default-kernel
|
|
|
24fce8 |
+grubDisplayTest grub.1 defaultkernel/g.1 --boot-filesystem=/boot --default-kernel
|
|
|
24fce8 |
+grubDisplayTest grub.1 defaultkernel/g.2 --boot-filesystem=/ --default-kernel
|
|
|
24fce8 |
|
|
|
24fce8 |
testing="LILO default directive"
|
|
|
24fce8 |
liloTest lilo.1 default/l1.1 --set-default=/boot/vmlinuz-2.4.18-4
|
|
|
24fce8 |
diff --git a/test/results/defaultkernel/g.2 b/test/results/defaultkernel/g.2
|
|
|
24fce8 |
new file mode 100644
|
|
|
24fce8 |
index 00000000000..d15855e1b57
|
|
|
24fce8 |
--- /dev/null
|
|
|
24fce8 |
+++ b/test/results/defaultkernel/g.2
|
|
|
24fce8 |
@@ -0,0 +1 @@
|
|
|
24fce8 |
+/vmlinuz-2.4.7-2
|
|
|
24fce8 |
--
|
|
|
24fce8 |
2.17.1
|
|
|
24fce8 |
|