From: proski Date: Wed, 15 Jul 2009 15:00:26 +0000 (+0000) Subject: 2009-07-15 Pavel Roskin X-Git-Tag: 1.98~713 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=379c54c1b351324b4d083cbe0a6b97c2720d301e;p=thirdparty%2Fgrub.git 2009-07-15 Pavel Roskin * boot/i386/pc/boot.S (general_error_string): Add DOS newline at the end of "Error" to make the message more readable. --- diff --git a/ChangeLog b/ChangeLog index 0e216e470..889bbd3ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-07-15 Pavel Roskin + * boot/i386/pc/boot.S (general_error_string): Add DOS newline at + the end of "Error" to make the message more readable. + * boot/i386/pc/boot.S (kernel_segment): Remove. (copy_buffer): Use GRUB_BOOT_MACHINE_KERNEL_ADDR in segment 0 for destination. diff --git a/boot/i386/pc/boot.S b/boot/i386/pc/boot.S index 15d02e503..1fb5f7416 100644 --- a/boot/i386/pc/boot.S +++ b/boot/i386/pc/boot.S @@ -433,7 +433,7 @@ notification_string: .asciz "GRUB " geometry_error_string: .asciz "Geom" hd_probe_error_string: .asciz "Hard Disk" read_error_string: .asciz "Read" -general_error_string: .asciz " Error" +general_error_string: .asciz " Error\r\n" /* * message: write the string pointed to by %si