Rename CD-ROM to cd on BIOS.

	* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_get_drive): Recognise
	"cd".
	(grub_biosdisk_call_hook): Call with "cd" instead of arbitrary hdX.

diff --git a/ChangeLog b/ChangeLog
index 03114c54e7de14097380a56c8c9864f96ee3f394..05a3ddf908e522561bbc7e2d44729cd0b0c597f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Rename CD-ROM to cd on BIOS.
+
+       * grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_get_drive): Recognise
+       "cd".
+       (grub_biosdisk_call_hook): Call with "cd" instead of arbitrary hdX.
+
 2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/emu/main.c (main): Reinit LVM and RAID.

diff --git a/grub-core/disk/i386/pc/biosdisk.c b/grub-core/disk/i386/pc/biosdisk.c
index 17de0c1a1fecb5ab5a9877cea6625de5bc05e9c0..9c02096936b32e52880e706a041ad346bd319e61 100644 (file)
--- a/grub-core/disk/i386/pc/biosdisk.c
+++ b/grub-core/disk/i386/pc/biosdisk.c
@@ -248,6 +248,9 @@ grub_biosdisk_get_drive (const char *name)
 {
   unsigned long drive;
 
+  if (name[0] == 'c' && name[1] == 'd' && name[2] == 0 && cd_drive)
+    return cd_drive;
+
   if ((name[0] != 'f' && name[0] != 'h') || name[1] != 'd')
     goto fail;
 
@@ -270,6 +273,9 @@ grub_biosdisk_call_hook (int (*hook) (const char *name), int drive)
 {
   char name[10];
 
+  if (cd_drive && drive == cd_drive)
+    return hook ("cd");
+
   grub_snprintf (name, sizeof (name),
                 (drive & 0x80) ? "hd%d" : "fd%d", drive & (~0x80));
   return hook (name);