X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgrub;h=2b0544bd7c053cac6a754d2d2168b62f5410e5bc;hb=b2c242219166e1e45704b7d8dafe910d728f6327;hp=76315fa37e67fdd4d3859699d99e88be4a58e23d;hpb=534fb55f9d0a212c5d857eb3eccabe5c08df1ba1;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/grub b/lfs/grub
index 76315fa37..2b0544bd7 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -75,21 +75,28 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
 	# Applying patches.
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-fedora-18.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-gentoo-14.patch
 	cd $(DIR_APP) && autoreconf
 	cd $(DIR_APP) && autoconf
 
 	# Build.
-	cd $(DIR_APP) && CFLAGS="$(CFLAGS)" ./configure --prefix=/usr
+	cd $(DIR_APP) && CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
+		--disable-auto-linux-mem-opt
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
 	# grub files
 	mkdir -vp /boot/grub
-	cp -v /usr/share/grub/i386-pc/stage{1,2} /boot/grub
+	cp -v /usr/lib/grub/i386-pc/stage{1,2} /boot/grub
 	for i in $(DIR_SRC)/config/grub/*; do \
 	    [ -f $$i ] && cp -f $$i /boot/grub; \
 	done
 
+	# generate default file
+	grub-set-default 0
+
+	# Disable PaX mprotect for grub
+	paxctl -m /usr/sbin/grub
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)