Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 55277
Collapse All | Expand All

(-)grub/lib/device.c (-1 / +32 lines)
Lines 263-268 Link Here
263
#endif
263
#endif
264
}
264
}
265
265
266
#ifdef __linux__
267
/* Adding support for ATARAID disks. -Boji 2003/11/26  */
268
static void
269
get_ataraid_disk_name (char *name, int unit)
270
{
271
  /* GNU/Linux */
272
  sprintf (name, "/dev/ataraid/d%c", unit + '0');
273
}
274
#endif
275
266
static void
276
static void
267
get_scsi_disk_name (char *name, int unit)
277
get_scsi_disk_name (char *name, int unit)
268
{
278
{
Lines 627-633 Link Here
627
	  num_hd++;
637
	  num_hd++;
628
	}
638
	}
629
    }
639
    }
630
  
640
641
#ifdef __linux__
642
  /* Adding support for ATARAID disks. -Boji 2003/11/26  */
643
  for (i = 0; i < 8; i++)
644
    {
645
      char name[20];
646
647
      get_ataraid_disk_name (name, i);
648
      if (check_device (name))
649
        {
650
          (*map)[num_hd + 0x80] = strdup (name);
651
          assert ((*map)[num_hd + 0x80]);
652
653
          /* If the device map file is opened, write the map.  */
654
          if (fp)
655
            fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
656
657
          num_hd++;
658
        }
659
    }
660
#endif /* __linux__ */
661
 
631
  /* The rest is SCSI disks.  */
662
  /* The rest is SCSI disks.  */
632
  for (i = 0; i < 16; i++)
663
  for (i = 0; i < 16; i++)
633
    {
664
    {
(-)grub/util/grub-install.in (+3 lines)
Lines 89-101 Link Here
89
    fi
89
    fi
90
90
91
    # Break the device name into the disk part and the partition part.
91
    # Break the device name into the disk part and the partition part.
92
    # Added parsing for ATARAID disks. - Boji 2003/11/26
92
    case "$host_os" in
93
    case "$host_os" in
93
    linux*)
94
    linux*)
94
	tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
95
	tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
96
				  -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
95
				  -e 's%\(fd[0-9]*\)$%\1%' \
97
				  -e 's%\(fd[0-9]*\)$%\1%' \
96
				  -e 's%/part[0-9]*$%/disc%' \
98
				  -e 's%/part[0-9]*$%/disc%' \
97
				  -e 's%\(c[0-7]d[0-9]*\).*$%\1%'`
99
				  -e 's%\(c[0-7]d[0-9]*\).*$%\1%'`
98
	tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
100
	tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
101
				  -e 's%.*d[0-9]*p*%%' \
99
				  -e 's%.*/fd[0-9]*$%%' \
102
				  -e 's%.*/fd[0-9]*$%%' \
100
				  -e 's%.*/floppy/[0-9]*$%%' \
103
				  -e 's%.*/floppy/[0-9]*$%%' \
101
				  -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
104
				  -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \

Return to bug 55277