* util/i386/pc/grub-setup.c (usage): Warn against running grub-setup

directly, and recommend grub-install instead.
* util/sparc64/ieee1275/grub-setup.c (usage): Likewise.

diff --git a/ChangeLog b/ChangeLog
index e2f240f40fc4e3e95c73350b75c2a4143da7e649..83023d9cdbc4b058942bf3fd4807fc3819d9704c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-17  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/i386/pc/grub-setup.c (usage): Warn against running grub-setup
+       directly, and recommend grub-install instead.
+       * util/sparc64/ieee1275/grub-setup.c (usage): Likewise.
+
 2010-06-17  Colin Watson  <cjwatson@ubuntu.com>
 
        Fix i386-pc prefix handling with nested partitions (Debian bug

diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 454fba9fa212b80e6a9c847a06e76514b5c4a100..d04bf761963c9c37637245f685e00ea140a5a1c7 100644 (file)
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -608,6 +608,8 @@ Usage: %s [OPTION]... DEVICE\n\
 \n\
 Set up images to boot from DEVICE.\n\
 DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
+\n\
+You should not normally run %s directly.  Use grub-install instead.
 \n\
   -b, --boot-image=FILE   use FILE as the boot image [default=%s]\n\
   -c, --core-image=FILE   use FILE as the core image [default=%s]\n\

diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 218a0e037bb8c6136d07554dd5a4128877d6ed38..c20d2a046de16f2ff5cb167f5a8c684c077cd098 100644 (file)
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -407,6 +407,8 @@ Usage: %s [OPTION]... DEVICE\n\
 \n\
 Set up images to boot from DEVICE.\n\
 DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
+\n\
+You should not normally run %s directly.  Use grub-install instead.
 \n\
   -b, --boot-image=FILE   use FILE as the boot image [default=%s]\n\
   -c, --core-image=FILE   use FILE as the core image [default=%s]\n\