From d98d9cad88c6b40a49b0f5c498e5c63a97e3bb9e Mon Sep 17 00:00:00 2001 From: robertmh Date: Tue, 1 Jan 2008 21:59:03 +0000 Subject: [PATCH] 2008-01-01 Robert Millan * util/biosdisk.c (get_os_disk): Fix check for IDE or SCSI discs. --- ChangeLog | 4 ++++ util/biosdisk.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf311d499..78ed72524 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-01-01 Robert Millan + + * util/biosdisk.c (get_os_disk): Fix check for IDE or SCSI discs. + 2008-01-01 Vesa Jaaskelainen * include/grub/video.h: Added grub_video_unmap_color and diff --git a/util/biosdisk.c b/util/biosdisk.c index c80c335c5..0099972b9 100644 --- a/util/biosdisk.c +++ b/util/biosdisk.c @@ -1,7 +1,7 @@ /* biosdisk.c - emulate biosdisk */ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 1999,2000,2001,2002,2003,2004,2006,2007 Free Software Foundation, Inc. + * Copyright (C) 1999,2000,2001,2002,2003,2004,2006,2007,2008 Free Software Foundation, Inc. * * GRUB is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -609,7 +609,7 @@ get_os_disk (const char *os_dev) if (have_devfs ()) { /* If this is an IDE disk. */ - if (strncmp ("/dev/ide/", p, 9) == 0) + if (strncmp ("ide/", p, 4) == 0) { p = strstr (p, "part"); if (p) @@ -619,7 +619,7 @@ get_os_disk (const char *os_dev) } /* If this is a SCSI disk. */ - if (strncmp ("/dev/scsi/", p, 10) == 0) + if (strncmp ("scsi/", p, 5) == 0) { p = strstr (p, "part"); if (p)