Jörg Sommer hat am Thu 13. Jan, 22:01 (+0100) geschrieben:
> The problem is the empty body of the function load_video.
>
> # sed -n 28,29p /boot/grub/grub.cfg.new
> function load_video {
> }
>
> diff --git a/grub.d/00_header b/grub.d/00_header
> index a688b32..fba12c7 100755
> --- a/grub.d/00_header
> +++ b/grub.d/00_header
The former patch missed the part to remove the call of load_video.
diff --git a/grub.d/00_header b/grub.d/00_header
index a688b32..a553466 100755
--- a/grub.d/00_header
+++ b/grub.d/00_header
@@ -75,25 +75,23 @@ function savedefault {
save_env saved_entry
fi
}
-
-function load_video {
EOF
+
if [ -n "${GRUB_VIDEO_BACKEND}" ]; then
- cat <<EOF
- insmod ${GRUB_VIDEO_BACKEND}
-EOF
-else
+ video_backend_modules=${GRUB_VIDEO_BACKEND}
+elif [ -s "${GRUB_PREFIX}/video.lst" ]; then
+ video_backend_modules=$(cat "${GRUB_PREFIX}/video.lst")
+fi
+if [ -n "${video_backend_modules:-}" ]; then
+ echo 'function load_video {'
# Insert all available backends; GRUB will use the most appropriate.
- for backend in $(cat "${GRUB_PREFIX}/video.lst"); do
- cat <<EOF
- insmod ${backend}
-EOF
+ for backend in $video_backend_modules; do
+ echo " insmod ${backend}"
done
+ echo '}'
+ load_video_defined=true
fi
-cat <<EOF
-}
-
-EOF
+echo ''
serial=0;
gfxterm=0;
@@ -125,8 +123,8 @@ if [ "x$gfxterm" = x1 ]; then
cat << EOF
if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT_PATH}"` ; then
set gfxmode=${GRUB_GFXMODE}
- load_video
- insmod gfxterm
+ ${load_video_defined:+load_video
+} insmod gfxterm
fi
EOF
fi
--
Dadurch, dass man einen anderen ins Irrenhaus sperrt,
beweist man noch nicht seinen eigenen Verstand.
signature.asc
Description: Digital signature http://en.wikipedia.org/wiki/OpenPGP
