* util/grub-setup.c (setup): Stop recommending --force. People who

	understand the dangers of blocklists are able to find this option
	anyway and the ones who don't shouldn't use it anyway.

diff --git a/ChangeLog b/ChangeLog
index 0cb1628cc5a8f8a75cd3479faff9698fb5fd4ed6..6596421b2a462d480352af20f2055537ca2d9981 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-setup.c (setup): Stop recommending --force. People who
+       understand the dangers of blocklists are able to find this option
+       anyway and the ones who don't shouldn't use it anyway.
+
 2010-11-26  Robert Millan  <rmh@gnu.org>
 
        * grub-core/term/i386/pc/vga_text.c (VGA_TEXT_SCREEN): Beautify.

diff --git a/util/grub-setup.c b/util/grub-setup.c
index fa95f94aadedd30c23687cfffd63db3cc7c9f64b..5f9b29f25e977a906b556265b15985866d6fc811 100644 (file)
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -492,7 +492,7 @@ unable_to_embed:
                    "setup by using blocklists.  However, blocklists are UNRELIABLE and "
                    "their use is discouraged."));
   if (! force)
-    grub_util_error (_("if you really want blocklists, use --force"));
+    grub_util_error (_("will not proceed with blocklists"));
 
   /* The core image must be put on a filesystem unfortunately.  */
   grub_util_info ("will leave the core image on the filesystem");