* grub-core/loader/i386/pc/plan9.c (grub_cmd_plan9): Remove PXE

	handling.
	* include/grub/disk.h (grub_disk_dev_id): Remove obsolete
	GRUB_DISK_DEVICE_UUID_ID, GRUB_DISK_DEVICE_PXE_ID and
	GRUB_DISK_DEVICE_FILE_ID.

diff --git a/ChangeLog b/ChangeLog
index 2af861197669b76aed1b4f63ef46bc0cd434c4ac..3471267cc09c84c4c338e09337c4e7a64d494830 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/loader/i386/pc/plan9.c (grub_cmd_plan9): Remove PXE
+       handling.
+       * include/grub/disk.h (grub_disk_dev_id): Remove obsolete
+       GRUB_DISK_DEVICE_UUID_ID, GRUB_DISK_DEVICE_PXE_ID and
+       GRUB_DISK_DEVICE_FILE_ID.
+
 2012-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/partition.c (grub_partition_get_name): Simplify logic

diff --git a/grub-core/loader/i386/pc/plan9.c b/grub-core/loader/i386/pc/plan9.c
index 5528b2c9f7c6d35c91a0c689c8d45f42ef909eac..169f83a43eb2bd5bde53e9b02afcb4de32b344aa 100644 (file)
--- a/grub-core/loader/i386/pc/plan9.c
+++ b/grub-core/loader/i386/pc/plan9.c
@@ -260,7 +260,6 @@ grub_cmd_plan9 (grub_extcmd_context_t ctxt, int argc, char *argv[])
        default:
 
          /* Not sure how to handle those. */
-       case GRUB_DISK_DEVICE_PXE_ID:
        case GRUB_DISK_DEVICE_NAND_ID:
          if (!file_disk)
            {

diff --git a/include/grub/disk.h b/include/grub/disk.h
index a8cbe46b523a997c027ddb0226e64105442d2389..27d74788df2a3e6b5b7c418e55df912a472b468b 100644 (file)
--- a/include/grub/disk.h
+++ b/include/grub/disk.h
@@ -37,10 +37,7 @@ enum grub_disk_dev_id
     GRUB_DISK_DEVICE_ATA_ID,
     GRUB_DISK_DEVICE_MEMDISK_ID,
     GRUB_DISK_DEVICE_NAND_ID,
-    GRUB_DISK_DEVICE_UUID_ID,
-    GRUB_DISK_DEVICE_PXE_ID,
     GRUB_DISK_DEVICE_SCSI_ID,
-    GRUB_DISK_DEVICE_FILE_ID,
     GRUB_DISK_DEVICE_CRYPTODISK_ID,
     GRUB_DISK_DEVICE_ARCDISK_ID,
   };