summaryrefslogtreecommitdiffstats
path: root/test/parser
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javierm@redhat.com>2019-06-20 18:09:55 +0200
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2019-06-21 13:42:15 +1000
commit53e0f3ef35ac694220dce135f01a4f736cbd1c19 (patch)
tree719881f0d1ef1bd0b8ab9dfc44f897ee83f592f4 /test/parser
parentcd95d81c16bd7f312214e2800bf0600f96f9307c (diff)
downloadtalos-petitboot-53e0f3ef35ac694220dce135f01a4f736cbd1c19.tar.gz
talos-petitboot-53e0f3ef35ac694220dce135f01a4f736cbd1c19.zip
discover/grub2: Allow using title for default even if id was defined
A default menu entry can be chosen using any of the following attributes: index, title or id (if the entry was defined with the --id option). But Petitboot doesn't honor this correctly and only compares the default with the menu entry title if the entry doesn't have an id defined. This is wrong since an index or title can be used even if an id was defined. This issue wasn't covered by the test that sets a default using a title because the menu entries didn't have an id defined. Add an id to them. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'test/parser')
-rw-r--r--test/parser/test-grub2-default-multiword.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/parser/test-grub2-default-multiword.c b/test/parser/test-grub2-default-multiword.c
index 25d1cf1..d455d62 100644
--- a/test/parser/test-grub2-default-multiword.c
+++ b/test/parser/test-grub2-default-multiword.c
@@ -3,10 +3,10 @@
#if 0 /* PARSER_EMBEDDED_CONFIG */
set default="Multiple word option"
-menuentry 'Non-defalt option' {
+menuentry 'Non-defalt option' --id=option0 {
linux /vmlinux.non-default
}
-menuentry 'Multiple word option' {
+menuentry 'Multiple word option' --id=option1 {
linux /vmlinux
}
#endif
OpenPOWER on IntegriCloud