Package: elilo
Version: 3.6-3.1
Severity: important
Tags: patch fixed-upstream
ELILO 3.6 has a bug that if a vmm= is supplied in the default boot
option, it doesn't get cleared for other boot options. Thus, if your
default boot option is for a Xen entry, it's all but impossible to boot
a non-Xen kernel. The patch below is extracted from upstream CVS and
fixes the problem.
--- a/choosers/simple.c 2005/12/01 21:42:59 1.4
+++ b/choosers/simple.c 2006/01/27 20:19:51 1.5
@@ -274,7 +274,7 @@
argc = argify(alt_buffer,sizeof(alt_buffer), argv);
alt_argv = argv;
index = 0;
- args[0] = initrd_name[0] = 0;
+ args[0] = initrd_name[0] = vmcode_name[0] = 0;
/*
* don't check twice because the variable is deleted after
* first access
@@ -354,7 +354,7 @@
ret = wait_timeout(elilo_opt.delay);
if (ret != 0) {
elilo_opt.prompt = 1;
- elilo_opt.initrd[0] = CHAR_NULL;
+ elilo_opt.initrd[0] = elilo_opt.vmcode[0] = CHAR_NULL;
elilo_opt.timeout = ELILO_TIMEOUT_INFINITY;
goto restart;
}
--- a/choosers/textmenu.c 2005/12/23 00:07:12 1.6
+++ b/choosers/textmenu.c 2006/01/27 20:19:51 1.7
@@ -465,7 +465,7 @@
ret = wait_timeout(elilo_opt.delay);
if (ret != 0) {
elilo_opt.prompt = 1;
- elilo_opt.initrd[0] = CHAR_NULL;
+ elilo_opt.initrd[0] = elilo_opt.vmcode[0] = CHAR_NULL;
elilo_opt.timeout = ELILO_TIMEOUT_INFINITY;
goto restart;
}
--- a/ChangeLog 2006/01/09 21:15:45 1.8
+++ b/ChangeLog 2006/01/27 20:19:51 1.9
@@ -1,3 +1,6 @@
+2006-01-27 Alex Williamson <[EMAIL PROTECTED]>
+ * Found a couple more places where vmcode isn't zeroed, causing the
+ option to get carried over to labels it shouldn't.
2006-01-09 Brett Johnson <[EMAIL PROTECTED]>
* Released 3.6
2005-12-22 Alex Williamson <[EMAIL PROTECTED]>
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
