vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix a bug in the Linux cmdline handling code.

Browse source
This commit is contained in:
okuji 2000-10-16 04:27:56 +00:00
parent 11236082ea
commit 092f32f05b
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2000-10-16 OKUJI Yoshinori <okuji@gnu.org>
* stage2/boot.c (load_image): When handling Linux cmdline, don't
copy a null character from SRC to DEST, because this inserted an
extra null character into the cmdline. Reported by Robert
Bihlmeyer <robbe@orcus.priv.at>.
2000-10-16 OKUJI Yoshinori <okuji@gnu.org> 2000-10-16 OKUJI Yoshinori <okuji@gnu.org>
Some of the new Multiboot features are supported. APM support Some of the new Multiboot features are supported. APM support

5
stage2/boot.c
View file

@ -320,8 +320,9 @@ load_image (char *kernel, char *arg, kernel_t suggested_type,
char *src = skip_to (0, arg); char *src = skip_to (0, arg);
char *dest = (char *) CL_MY_LOCATION; char *dest = (char *) CL_MY_LOCATION;
while (((int) dest) < CL_MY_END_ADDR && (*(dest++) = *(src++))); while (((int) dest) < CL_MY_END_ADDR && *src)
*(dest++) = *(src++);
/* Add a mem option automatically only if the user doesn't /* Add a mem option automatically only if the user doesn't
specify it explicitly. */ specify it explicitly. */
if (! grub_strstr (arg, "mem=") if (! grub_strstr (arg, "mem=")