vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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.
This commit is contained in:
robertmh 2008-11-20 19:22:20 +00:00
parent 3cf6ac19e1
commit 73e8e268b7
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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.

7
util/grub-mkconfig_lib.in
View File

@ -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

2
util/grub.d/00_header.in
View File

@ -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}"

3
util/update-grub_lib.in
View File

@ -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"