From: Mike Auty <ikelos@gentoo.org>
Date: Sun, 8 Apr 2012 19:31:37 +0000 (+0200)
Subject: Support for Grub 2
X-Git-Tag: v3.4.29~1^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fd1f01f299b6e4e5d6963d61a72ad09578cd4e77;p=genkernel.git

Support for Grub 2
---

diff --git a/ChangeLog b/ChangeLog
index 0e6d697..d34cfec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  08 Apr 2012; Mike Auty <ikelos@gentoo.org> gen_bootloader.sh:
+  Support for Grub 2
+
   08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh,
   genkernel.conf:
   Add "fastest" to supported initrd compressions
diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 79531d4..1debfe9 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -5,6 +5,9 @@ set_bootloader() {
 		grub)
 			set_bootloader_grub
 			;;
+		grub2)
+			set_bootloader_grub2
+			;;
 		*)
 			print_warning "Bootloader ${BOOTLOADER} is not currently supported"
 			;;
@@ -28,6 +31,24 @@ set_bootloader_grub_read_device_map() {
 	echo "${TEMP}/grub.map"
 }
 
+set_bootloader_grub2() {
+    local GRUB_CONF
+    if [ -e "${BOOTDIR}/grub2/grub.cfg" ]
+    then
+		GRUB_CONF="${BOOTDIR}/grub2/grub.cfg"
+    elif [ -e "${BOOTDIR}/grub/grub.cfg" ]
+    then
+		GRUB_CONF="${BOOTDIR}/grub/grub.cfg"
+    else
+		print_error 1 "Error! Grub2 configuration file does not exist, please ensure grub2 is correctly setup first."
+        	return 0
+    fi
+
+    print_info 1 "You can customize Grub2 parameters in /etc/defaults/grub."
+    print_info 1 "Running grub-mkconfig to create ${GRUB_CONF}..."
+    grub-mkconfig -o ${GRUB_CONF}
+}
+
 set_bootloader_grub() {
 	local GRUB_CONF="${BOOTDIR}/grub/grub.conf"