From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 18 Dec 2009 03:56:03 +0000 (+0100)
Subject: Remove unwantred commits
X-Git-Tag: 1.98~307^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52d1a0fd1a7e36892a9cf334b3d9b335b94a9389;p=thirdparty%2Fgrub.git

Remove unwantred commits
---

diff --git a/fs/i386/pc/pxe.c b/fs/i386/pc/pxe.c
index d2c9c7716..6c41d4298 100644
--- a/fs/i386/pc/pxe.c
+++ b/fs/i386/pc/pxe.c
@@ -65,6 +65,7 @@ grub_pxe_open (const char *name, grub_disk_t disk)
   disk->total_sectors = 0;
   disk->id = (unsigned long) "pxe";
 
+  disk->has_partitions = 0;
   disk->data = 0;
 
   return GRUB_ERR_NONE;
diff --git a/normal/completion.c b/normal/completion.c
index 7b3de449c..4b38e334d 100644
--- a/normal/completion.c
+++ b/normal/completion.c
@@ -161,23 +161,14 @@ iterate_dev (const char *devname)
 
   if (dev)
     {
-      char tmp[grub_strlen (devname) + sizeof (",")];
-
-      grub_memcpy (tmp, devname, grub_strlen (devname));
-
-      if (grub_strcmp (devname, current_word) == 0)
+      if (dev->disk && dev->disk->has_partitions)
 	{
-	  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;
 	}
       else
 	{
-	  grub_memcpy (tmp + grub_strlen (devname), "", sizeof (""));
-	  if (add_completion (tmp, "", GRUB_COMPLETION_TYPE_DEVICE))
+	  if (add_completion (devname, ")", GRUB_COMPLETION_TYPE_DEVICE))
 	    return 1;
 	}
     }
@@ -225,7 +216,7 @@ complete_device (void)
 
       if (dev)
 	{
-	  if (dev->disk)
+	  if (dev->disk && dev->disk->has_partitions)
 	    {
 	      if (grub_partition_iterate (dev->disk, iterate_partition))
 		{
diff --git a/normal/misc.c b/normal/misc.c
index cddd1d3d3..0a1a2f052 100644
--- a/normal/misc.c
+++ b/normal/misc.c
@@ -94,8 +94,10 @@ grub_normal_print_device_info (const char *name)
 	      grub_errno = GRUB_ERR_NONE;
 	    }
 	}
-      else
+      else if (! dev->disk->has_partitions || dev->disk->partition)
 	grub_printf ("Unknown filesystem");
+      else
+	grub_printf ("Partition table");
 
       grub_device_close (dev);
     }