2006-10-14 Yoshinori K. Okuji <okuji@enbug.org>

* util/i386/pc/grub-probe.c (probe): Print DEVICE_NAME instead of
        DRIVE_NAME when grub_util_biosdisk_get_grub_dev fails. Open
        DRIVE_NAME instead of DEVICE_NAME. Make sure that DEVICE_NAME and
        DRIVE_NAME are always freed.

        * util/i386/pc/biosdisk.c (make_device_name): Add one into
        DOS_PART, as a DOS partition is counted from one instead of zero
        now. Reported by Robert Millan.
This commit is contained in:
okuji 2006-10-14 21:07:48 +00:00
parent 4dc2cf6c2f
commit e0994b8b1c
3 changed files with 24 additions and 9 deletions

View file

@ -592,7 +592,7 @@ make_device_name (int drive, int dos_part, int bsd_part)
sprintf (p, (drive & 0x80) ? "hd%d" : "fd%d", drive & ~0x80);
if (dos_part >= 0)
sprintf (p + strlen (p), ",%d", dos_part);
sprintf (p + strlen (p), ",%d", dos_part + 1);
if (bsd_part >= 0)
sprintf (p + strlen (p), ",%c", bsd_part + 'a');