* util/grub-mkconfig_lib.in (grub_warn): New function.

        (convert_system_path_to_grub_path): Use grub_warn() when issuing
        warnings, to obtain consistent formatting.
        * util/grub.d/00_header.in: Likewise.
        * util/update-grub_lib.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 8009d80228051a5ef0b4868885ed4836c88afe9d..8517aed5acd2374bd93d4147b6174d5950082a0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
-2008-11-19  Robert Millan  <rmh@aybabtu.com>
+2008-11-20  Robert Millan  <rmh@aybabtu.com>
 
        * kern/i386/coreboot/init.c (grub_time_tics): Remove variable.
        (grub_get_rtc, grub_exit): Abort with grub_fatal() if called.
 
+       * util/grub-mkconfig_lib.in (grub_warn): New function.
+       (convert_system_path_to_grub_path): Use grub_warn() when issuing
+       warnings, to obtain consistent formatting.
+       * util/grub.d/00_header.in: Likewise.
+       * util/update-grub_lib.in: Likewise.
+
 2008-11-19  Robert Millan  <rmh@aybabtu.com>
 
        * loader/i386/pc/linux.c (grub_rescue_cmd_initrd): Fix a typo.

diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 83eb3b8d79d95c95105684eb83151780b8c75478..fb842f2d4f6fe892c5b2cfc34504cdbd34fde930 100644 (file)
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -25,6 +25,11 @@ pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`
 
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 
+grub_warn ()
+{
+  echo "Warning: $@" >&2
+}
+
 make_system_path_relative_to_its_root ()
 {
   path=$1
@@ -107,7 +112,7 @@ convert_system_path_to_grub_path ()
 {
   path=$1
 
-  echo "Warning: convert_system_path_to_grub_path() is deprecated.  Use prepare_grub_to_access_device() instead." >&2
+  grub_warn "convert_system_path_to_grub_path() is deprecated.  Use prepare_grub_to_access_device() instead."
 
   # abort if GRUB can't access the path
   if is_path_readable_by_grub ${path} ; then : ; else

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index fe17b6769715bbf0bc4c35345d20fca13ab6902d..3d434d7656721c0b16115fadbaf00ad0cefb12ff 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -47,7 +47,7 @@ case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in
     fi
 
     if [ "x${GRUB_SERIAL_COMMAND}" = "x" ] ; then
-      echo "Warning, requested serial terminal but GRUB_SERIAL_COMMAND is unspecified. Default parameters will be used." >&2
+      grub_warn "Requested serial terminal but GRUB_SERIAL_COMMAND is unspecified. Default parameters will be used."
       GRUB_SERIAL_COMMAND=serial
     fi
     echo "${GRUB_SERIAL_COMMAND}"

diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in
index 25311ce2ba95842aa2e8a1aec69e885355277c5c..998452e67c102fe076f31c839abb81f0357a02cf 100644 (file)
--- a/util/update-grub_lib.in
+++ b/util/update-grub_lib.in
@@ -18,5 +18,6 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 
-echo "warning: update-grub_lib is deprecated, use grub-mkconfig_lib instead" >&2
 . ${libdir}/grub/grub-mkconfig_lib
+
+grub_warn "update-grub_lib is deprecated, use grub-mkconfig_lib instead"