Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update

[people/pmueller/ipfire-2.x.git] / lfs / grub

diff --git a/lfs/grub b/lfs/grub
index d04036a487d88e03495a94f133c718fda66b7940..04aaa0b2542b283918f0628e167fdf06588aa3b3 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.00_disable_vga_fallback.patch
        cd $(DIR_APP) && \
                ./configure \
                        --prefix=/usr \
@@ -92,6 +93,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -mkdir -pv /boot/grub
        touch /boot/grub/grub.cfg
        ln -svf ../boot/grub/grub.cfg /etc/grub2.cfg
+       install -m 644 $(DIR_SRC)/config/grub2/splash.png /boot/grub/splash.png
 
        -mkdir -pv /etc/default
        install -m 644 $(DIR_SRC)/config/grub2/default /etc/default/grub