vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove unwantred commits

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-18 04:56:03 +01:00
parent 7ea73643f5
commit 52d1a0fd1a
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fs/i386/pc/pxe.c
View file

@ -65,6 +65,7 @@ grub_pxe_open (const char *name, grub_disk_t disk)
disk->total_sectors = 0; disk->total_sectors = 0;
disk->id = (unsigned long) "pxe"; disk->id = (unsigned long) "pxe";
disk->has_partitions = 0;
disk->data = 0; disk->data = 0;
return GRUB_ERR_NONE; return GRUB_ERR_NONE;

17
normal/completion.c
View file

@ -161,23 +161,14 @@ iterate_dev (const char *devname)
if (dev) if (dev)
{ {
char tmp[grub_strlen (devname) + sizeof (",")]; if (dev->disk && dev->disk->has_partitions)
grub_memcpy (tmp, devname, grub_strlen (devname));
if (grub_strcmp (devname, current_word) == 0)
{ {
if (add_completion (devname, ")", GRUB_COMPLETION_TYPE_PARTITION)) if (add_completion (devname, ",", GRUB_COMPLETION_TYPE_DEVICE))
return 1;
if (dev->disk)
if (grub_partition_iterate (dev->disk, iterate_partition))
return 1; return 1;
} }
else else
{ {
grub_memcpy (tmp + grub_strlen (devname), "", sizeof ("")); if (add_completion (devname, ")", GRUB_COMPLETION_TYPE_DEVICE))
if (add_completion (tmp, "", GRUB_COMPLETION_TYPE_DEVICE))
return 1; return 1;
} }
} }
@ -225,7 +216,7 @@ complete_device (void)
if (dev) if (dev)
{ {
if (dev->disk) if (dev->disk && dev->disk->has_partitions)
{ {
if (grub_partition_iterate (dev->disk, iterate_partition)) if (grub_partition_iterate (dev->disk, iterate_partition))
{ {

4
normal/misc.c
View file

@ -94,8 +94,10 @@ grub_normal_print_device_info (const char *name)
grub_errno = GRUB_ERR_NONE; grub_errno = GRUB_ERR_NONE;
} }
} }
else else if (! dev->disk->has_partitions || dev->disk->partition)
grub_printf ("Unknown filesystem"); grub_printf ("Unknown filesystem");
else
grub_printf ("Partition table");
grub_device_close (dev); grub_device_close (dev);
} }