You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.3 KiB
42 lines
1.3 KiB
2 years ago
|
From ec969de50ea5fa31d98cd00afa6a3f8a43e606a4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Jones <pjones@redhat.com>
|
||
|
|
Date: Thu, 2 Jul 2015 14:30:09 -0400
|
||
|
|
Subject: [PATCH 10/55] Make the grub1 "defaultkernel" test more reliable.
|
||
|
|
|
||
|
|
Basically just do it twice with various incarnations of
|
||
|
|
--boot-filesystem={/,/boot}
|
||
|
|
|
||
|
|
Related: rhbz#1184014
|
||
|
|
|
||
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||
|
|
---
|
||
|
|
test.sh | 3 ++-
|
||
|
|
test/results/defaultkernel/g.2 | 1 +
|
||
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
create mode 100644 test/results/defaultkernel/g.2
|
||
|
|
|
||
|
|
diff --git a/test.sh b/test.sh
|
||
|
|
index 96e0087b1e2..2985fd62bf9 100755
|
||
|
|
--- a/test.sh
|
||
|
|
+++ b/test.sh
|
||
|
|
@@ -299,7 +299,8 @@ grubDisplayTest grub.10 defaulttitle/g.10 --default-title
|
||
|
|
grubDisplayTest grub.11 defaulttitle/g.11 --default-title
|
||
|
|
|
||
|
|
testing="GRUB display default kernel"
|
||
|
|
-grubDisplayTest grub.1 defaultkernel/g.1 --default-kernel
|
||
|
|
+grubDisplayTest grub.1 defaultkernel/g.1 --boot-filesystem=/boot --default-kernel
|
||
|
|
+grubDisplayTest grub.1 defaultkernel/g.2 --boot-filesystem=/ --default-kernel
|
||
|
|
|
||
|
|
testing="LILO default directive"
|
||
|
|
liloTest lilo.1 default/l1.1 --set-default=/boot/vmlinuz-2.4.18-4
|
||
|
|
diff --git a/test/results/defaultkernel/g.2 b/test/results/defaultkernel/g.2
|
||
|
|
new file mode 100644
|
||
|
|
index 00000000000..d15855e1b57
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/test/results/defaultkernel/g.2
|
||
|
|
@@ -0,0 +1 @@
|
||
|
|
+/vmlinuz-2.4.7-2
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|