* grub-core/commands/ls.c (grub_ls_list_devices): Disable

	network protocol listing since it introduces problematic dependency on
	net module.

diff --git a/ChangeLog b/ChangeLog
index 3c02bf1f73a3605f6ae702fb355db3563db54f41..65c88ba92a2c2b8f278c053735ea17786c7540c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/ls.c (grub_ls_list_devices): Disable
+       network protocol listing since it introduces problematic dependency on
+       net module.
+
 2012-06-26  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-mkimage.c (generate_image): Add Yeeloong verified hash.

diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
index 8b9fe73440abe7ce9564f105119db2cfb3acc7e8..913bb65462eba672e4b954bcdf31eb5a20c57dfe 100644 (file)
--- a/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@ -62,7 +62,7 @@ grub_ls_list_devices (int longlist)
   grub_device_iterate (grub_ls_print_devices);
   grub_xputs ("\n");
 
-#ifndef GRUB_UTIL
+#if 0
   {
     grub_net_app_level_t proto;
     int first = 1;